Improve speed
* Replace relative layouts and use Recycler view * Handle HTML in background
This commit is contained in:
Coffeemakr
parent
4f8b51701b
commit
6d74038866
18 changed files with 546 additions and 507 deletions
|
|
@ -213,7 +213,7 @@ public class ChannelFragment extends BaseFragment implements ChannelExtractorWor
|
|||
|
||||
channelVideosList.setLayoutManager(new LinearLayoutManager(activity));
|
||||
if (infoListAdapter == null) {
|
||||
infoListAdapter = new InfoListAdapter(activity, rootView);
|
||||
infoListAdapter = new InfoListAdapter(activity);
|
||||
if (savedInstanceState != null) {
|
||||
//noinspection unchecked
|
||||
ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
|
||||
|
|
|
|||
|
|
@ -1,12 +1,17 @@
|
|||
package org.schabi.newpipe.fragments.detail;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.HandlerThread;
|
||||
import android.os.Looper;
|
||||
import android.os.Message;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.support.annotation.FloatRange;
|
||||
import android.support.annotation.NonNull;
|
||||
|
|
@ -14,7 +19,10 @@ import android.support.v4.content.ContextCompat;
|
|||
import android.support.v4.view.animation.FastOutSlowInInterpolator;
|
||||
import android.support.v7.app.ActionBar;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.text.Html;
|
||||
import android.text.Spanned;
|
||||
import android.text.TextUtils;
|
||||
import android.text.method.LinkMovementMethod;
|
||||
import android.util.Log;
|
||||
|
|
@ -26,7 +34,7 @@ import android.view.MenuInflater;
|
|||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.LinearLayout;
|
||||
|
|
@ -43,14 +51,15 @@ import org.schabi.newpipe.ImageErrorLoadingListener;
|
|||
import org.schabi.newpipe.R;
|
||||
import org.schabi.newpipe.ReCaptchaActivity;
|
||||
import org.schabi.newpipe.download.DownloadDialog;
|
||||
import org.schabi.newpipe.extractor.InfoItem;
|
||||
import org.schabi.newpipe.extractor.MediaFormat;
|
||||
import org.schabi.newpipe.extractor.NewPipe;
|
||||
import org.schabi.newpipe.extractor.stream_info.AudioStream;
|
||||
import org.schabi.newpipe.extractor.stream_info.StreamInfo;
|
||||
import org.schabi.newpipe.extractor.stream_info.StreamInfoItem;
|
||||
import org.schabi.newpipe.extractor.stream_info.VideoStream;
|
||||
import org.schabi.newpipe.fragments.BaseFragment;
|
||||
import org.schabi.newpipe.info_list.InfoItemBuilder;
|
||||
import org.schabi.newpipe.info_list.InfoListAdapter;
|
||||
import org.schabi.newpipe.player.MainVideoPlayer;
|
||||
import org.schabi.newpipe.player.PlayVideoActivity;
|
||||
import org.schabi.newpipe.player.PopupVideoPlayer;
|
||||
|
|
@ -88,7 +97,6 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
private ArrayList<VideoStream> sortedStreamVideosList;
|
||||
private ActionBarHandler actionBarHandler;
|
||||
|
||||
private InfoItemBuilder infoItemBuilder = null;
|
||||
private StreamInfo currentStreamInfo = null;
|
||||
private StreamExtractorWorker curExtractorWorker;
|
||||
|
||||
|
|
@ -112,9 +120,9 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
private Spinner spinnerToolbar;
|
||||
|
||||
private ParallaxScrollView parallaxScrollRootView;
|
||||
private RelativeLayout contentRootLayoutHiding;
|
||||
private LinearLayout contentRootLayoutHiding;
|
||||
|
||||
private Button thumbnailBackgroundButton;
|
||||
private View thumbnailBackgroundButton;
|
||||
private ImageView thumbnailImageView;
|
||||
private ImageView thumbnailPlayButton;
|
||||
|
||||
|
|
@ -126,12 +134,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
private TextView detailControlsBackground;
|
||||
private TextView detailControlsPopup;
|
||||
|
||||
private RelativeLayout videoDescriptionRootLayout;
|
||||
private LinearLayout videoDescriptionRootLayout;
|
||||
private TextView videoUploadDateView;
|
||||
private TextView videoDescriptionView;
|
||||
|
||||
private View uploaderRootLayout;
|
||||
private Button uploaderButton;
|
||||
private TextView uploaderTextView;
|
||||
private ImageView uploaderThumb;
|
||||
|
||||
|
|
@ -142,9 +149,12 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
private TextView thumbsDisabledTextView;
|
||||
|
||||
private TextView nextStreamTitle;
|
||||
private RelativeLayout relatedStreamRootLayout;
|
||||
private LinearLayout relatedStreamsView;
|
||||
private LinearLayout relatedStreamRootLayout;
|
||||
private ImageButton relatedStreamExpandButton;
|
||||
private Handler uiHandler;
|
||||
private InfoListAdapter relatedStreamsAdapter;
|
||||
private Handler backgroundHandler;
|
||||
private HandlerThread backgroundHandlerThread;
|
||||
|
||||
/*////////////////////////////////////////////////////////////////////////*/
|
||||
|
||||
|
|
@ -194,6 +204,17 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
thousand = getString(R.string.short_thousand);
|
||||
million = getString(R.string.short_million);
|
||||
billion = getString(R.string.short_billion);
|
||||
|
||||
if(uiHandler == null) {
|
||||
uiHandler = new Handler(Looper.getMainLooper(), new UICallback());
|
||||
}
|
||||
if(backgroundHandler == null) {
|
||||
HandlerThread handlerThread = new HandlerThread("VideoDetailFragment-BG");
|
||||
handlerThread.start();
|
||||
backgroundHandlerThread = handlerThread;
|
||||
backgroundHandler = new Handler(handlerThread.getLooper(), new BackgroundCallback(uiHandler, getContext()));
|
||||
}
|
||||
relatedStreamsAdapter = new InfoListAdapter(getActivity());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -241,6 +262,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
if(backgroundHandlerThread != null) {
|
||||
backgroundHandlerThread.quit();
|
||||
}
|
||||
backgroundHandlerThread = null;
|
||||
backgroundHandler = null;
|
||||
PreferenceManager.getDefaultSharedPreferences(activity).unregisterOnSharedPreferenceChangeListener(this);
|
||||
}
|
||||
|
||||
|
|
@ -248,7 +274,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
public void onDestroyView() {
|
||||
if (DEBUG) Log.d(TAG, "onDestroyView() called");
|
||||
thumbnailImageView.setImageBitmap(null);
|
||||
relatedStreamsView.removeAllViews();
|
||||
relatedStreamsAdapter.clearStreamItemList();
|
||||
spinnerToolbar.setOnItemSelectedListener(null);
|
||||
|
||||
spinnerToolbar = null;
|
||||
|
|
@ -272,7 +298,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
videoUploadDateView = null;
|
||||
videoDescriptionView = null;
|
||||
|
||||
uploaderButton = null;
|
||||
uploaderRootLayout = null;
|
||||
uploaderTextView = null;
|
||||
uploaderThumb = null;
|
||||
|
||||
|
|
@ -284,7 +310,6 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
|
||||
nextStreamTitle = null;
|
||||
relatedStreamRootLayout = null;
|
||||
relatedStreamsView = null;
|
||||
relatedStreamExpandButton = null;
|
||||
|
||||
super.onDestroyView();
|
||||
|
|
@ -299,7 +324,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
outState.putSerializable(STACK_KEY, stack);
|
||||
|
||||
int nextCount = currentStreamInfo != null && currentStreamInfo.next_video != null ? 2 : 0;
|
||||
if (relatedStreamsView != null && relatedStreamsView.getChildCount() > INITIAL_RELATED_VIDEOS + nextCount) {
|
||||
if (relatedStreamsAdapter != null && relatedStreamsAdapter.getItemCount() > INITIAL_RELATED_VIDEOS + nextCount) {
|
||||
outState.putSerializable(WAS_RELATED_EXPANDED_KEY, true);
|
||||
}
|
||||
|
||||
|
|
@ -353,10 +378,14 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
case R.id.detail_controls_popup:
|
||||
openInPopup();
|
||||
break;
|
||||
case R.id.detail_uploader_button:
|
||||
NavigationHelper.openChannelFragment(getFragmentManager(), currentStreamInfo.service_id, currentStreamInfo.channel_url, currentStreamInfo.uploader);
|
||||
case R.id.detail_uploader_root_layout:
|
||||
if(currentStreamInfo.channel_url == null || currentStreamInfo.channel_url.isEmpty()) {
|
||||
Log.w(TAG, "Can't open channel because we got no channel URL");
|
||||
} else {
|
||||
NavigationHelper.openChannelFragment(getFragmentManager(), currentStreamInfo.service_id, currentStreamInfo.channel_url, currentStreamInfo.uploader);
|
||||
}
|
||||
break;
|
||||
case R.id.detail_thumbnail_background_button:
|
||||
case R.id.detail_thumbnail_root_layout:
|
||||
playVideo(currentStreamInfo);
|
||||
break;
|
||||
case R.id.detail_title_root_layout:
|
||||
|
|
@ -458,19 +487,13 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
int nextCount = info.next_video != null ? 2 : 0;
|
||||
int initialCount = INITIAL_RELATED_VIDEOS + nextCount;
|
||||
|
||||
if (relatedStreamsView.getChildCount() > initialCount) {
|
||||
relatedStreamsView.removeViews(initialCount, relatedStreamsView.getChildCount() - (initialCount));
|
||||
if (relatedStreamsAdapter.getItemCount() > initialCount) {
|
||||
relatedStreamsAdapter.removeItemRange(initialCount, relatedStreamsAdapter.getItemCount());
|
||||
relatedStreamExpandButton.setImageDrawable(ContextCompat.getDrawable(activity, getResourceIdFromAttr(R.attr.expand)));
|
||||
return;
|
||||
} else {
|
||||
relatedStreamsAdapter.addInfoItemList(info.related_streams.subList(INITIAL_RELATED_VIDEOS, info.related_streams.size()));
|
||||
relatedStreamExpandButton.setImageDrawable(ContextCompat.getDrawable(activity, getResourceIdFromAttr(R.attr.collapse)));
|
||||
}
|
||||
|
||||
//Log.d(TAG, "toggleExpandRelatedVideos() called with: info = [" + info + "], from = [" + INITIAL_RELATED_VIDEOS + "]");
|
||||
for (int i = INITIAL_RELATED_VIDEOS; i < info.related_streams.size(); i++) {
|
||||
InfoItem item = info.related_streams.get(i);
|
||||
//Log.d(TAG, "i = " + i);
|
||||
relatedStreamsView.addView(infoItemBuilder.buildView(relatedStreamsView, item));
|
||||
}
|
||||
relatedStreamExpandButton.setImageDrawable(ContextCompat.getDrawable(activity, getResourceIdFromAttr(R.attr.collapse)));
|
||||
}
|
||||
|
||||
/*//////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -484,12 +507,11 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
|
||||
parallaxScrollRootView = (ParallaxScrollView) rootView.findViewById(R.id.detail_main_content);
|
||||
|
||||
//thumbnailRootLayout = (RelativeLayout) rootView.findViewById(R.id.detail_thumbnail_root_layout);
|
||||
thumbnailBackgroundButton = (Button) rootView.findViewById(R.id.detail_thumbnail_background_button);
|
||||
thumbnailBackgroundButton = rootView.findViewById(R.id.detail_thumbnail_root_layout);
|
||||
thumbnailImageView = (ImageView) rootView.findViewById(R.id.detail_thumbnail_image_view);
|
||||
thumbnailPlayButton = (ImageView) rootView.findViewById(R.id.detail_thumbnail_play_button);
|
||||
|
||||
contentRootLayoutHiding = (RelativeLayout) rootView.findViewById(R.id.detail_content_root_hiding);
|
||||
contentRootLayoutHiding = (LinearLayout) rootView.findViewById(R.id.detail_content_root_hiding);
|
||||
|
||||
videoTitleRoot = rootView.findViewById(R.id.detail_title_root_layout);
|
||||
videoTitleTextView = (TextView) rootView.findViewById(R.id.detail_video_title_view);
|
||||
|
|
@ -499,7 +521,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
detailControlsBackground = (TextView) rootView.findViewById(R.id.detail_controls_background);
|
||||
detailControlsPopup = (TextView) rootView.findViewById(R.id.detail_controls_popup);
|
||||
|
||||
videoDescriptionRootLayout = (RelativeLayout) rootView.findViewById(R.id.detail_description_root_layout);
|
||||
videoDescriptionRootLayout = (LinearLayout) rootView.findViewById(R.id.detail_description_root_layout);
|
||||
videoUploadDateView = (TextView) rootView.findViewById(R.id.detail_upload_date_view);
|
||||
videoDescriptionView = (TextView) rootView.findViewById(R.id.detail_description_view);
|
||||
|
||||
|
|
@ -511,26 +533,28 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
thumbsDisabledTextView = (TextView) rootView.findViewById(R.id.detail_thumbs_disabled_view);
|
||||
|
||||
uploaderRootLayout = rootView.findViewById(R.id.detail_uploader_root_layout);
|
||||
uploaderButton = (Button) rootView.findViewById(R.id.detail_uploader_button);
|
||||
uploaderTextView = (TextView) rootView.findViewById(R.id.detail_uploader_text_view);
|
||||
uploaderThumb = (ImageView) rootView.findViewById(R.id.detail_uploader_thumbnail_view);
|
||||
|
||||
relatedStreamRootLayout = (RelativeLayout) rootView.findViewById(R.id.detail_related_streams_root_layout);
|
||||
relatedStreamRootLayout = (LinearLayout) rootView.findViewById(R.id.detail_related_streams_root_layout);
|
||||
nextStreamTitle = (TextView) rootView.findViewById(R.id.detail_next_stream_title);
|
||||
relatedStreamsView = (LinearLayout) rootView.findViewById(R.id.detail_related_streams_view);
|
||||
RecyclerView relatedStreamsView = (RecyclerView) rootView.findViewById(R.id.detail_related_streams_view);
|
||||
LinearLayoutManager llm = new LinearLayoutManager(rootView.getContext());
|
||||
llm.setOrientation(LinearLayoutManager.VERTICAL);
|
||||
relatedStreamsView.setLayoutManager(llm);
|
||||
relatedStreamsView.setAdapter(relatedStreamsAdapter);
|
||||
|
||||
relatedStreamExpandButton = ((ImageButton) rootView.findViewById(R.id.detail_related_streams_expand));
|
||||
|
||||
actionBarHandler = new ActionBarHandler(activity);
|
||||
videoDescriptionView.setMovementMethod(LinkMovementMethod.getInstance());
|
||||
|
||||
infoItemBuilder = new InfoItemBuilder(activity, rootView.findViewById(android.R.id.content));
|
||||
|
||||
setHeightThumbnail();
|
||||
}
|
||||
|
||||
protected void initListeners() {
|
||||
super.initListeners();
|
||||
infoItemBuilder.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
|
||||
relatedStreamsAdapter.setOnStreamInfoItemSelectedListener(new InfoItemBuilder.OnInfoItemSelectedListener() {
|
||||
@Override
|
||||
public void selected(int serviceId, String url, String title) {
|
||||
//NavigationHelper.openVideoDetail(activity, url, serviceId);
|
||||
|
|
@ -539,7 +563,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
});
|
||||
|
||||
videoTitleRoot.setOnClickListener(this);
|
||||
uploaderButton.setOnClickListener(this);
|
||||
uploaderRootLayout.setOnClickListener(this);
|
||||
thumbnailBackgroundButton.setOnClickListener(this);
|
||||
detailControlsBackground.setOnClickListener(this);
|
||||
detailControlsPopup.setOnClickListener(this);
|
||||
|
|
@ -563,24 +587,18 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
}
|
||||
|
||||
private void initRelatedVideos(StreamInfo info) {
|
||||
if (relatedStreamsView.getChildCount() > 0) relatedStreamsView.removeAllViews();
|
||||
relatedStreamsAdapter.clearStreamItemList();
|
||||
|
||||
if (info.next_video != null && showRelatedStreams) {
|
||||
nextStreamTitle.setVisibility(View.VISIBLE);
|
||||
relatedStreamsView.addView(infoItemBuilder.buildView(relatedStreamsView, info.next_video));
|
||||
relatedStreamsView.addView(getSeparatorView());
|
||||
relatedStreamsAdapter.addInfoItem(info.next_video);
|
||||
relatedStreamRootLayout.setVisibility(View.VISIBLE);
|
||||
} else nextStreamTitle.setVisibility(View.GONE);
|
||||
|
||||
if (info.related_streams != null && !info.related_streams.isEmpty() && showRelatedStreams) {
|
||||
//long first = System.nanoTime(), each;
|
||||
int to = info.related_streams.size() >= INITIAL_RELATED_VIDEOS ? INITIAL_RELATED_VIDEOS : info.related_streams.size();
|
||||
for (int i = 0; i < to; i++) {
|
||||
InfoItem item = info.related_streams.get(i);
|
||||
//each = System.nanoTime();
|
||||
relatedStreamsView.addView(infoItemBuilder.buildView(relatedStreamsView, item));
|
||||
//if (DEBUG) Log.d(TAG, "each took " + ((System.nanoTime() - each) / 1000000L) + "ms");
|
||||
}
|
||||
relatedStreamsAdapter.addInfoItemList(info.related_streams.subList(0, to));
|
||||
//if (DEBUG) Log.d(TAG, "Total time " + ((System.nanoTime() - first) / 1000000L) + "ms");
|
||||
|
||||
relatedStreamRootLayout.setVisibility(View.VISIBLE);
|
||||
|
|
@ -739,8 +757,17 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
// Get url from the new top
|
||||
StackItem peek = stack.peek();
|
||||
|
||||
if (peek.getInfo() != null) selectAndHandleInfo(peek.getInfo());
|
||||
else selectAndLoadVideo(0, peek.getUrl(), !TextUtils.isEmpty(peek.getTitle()) ? peek.getTitle() : "");
|
||||
if (peek.getInfo() != null) {
|
||||
final StreamInfo streamInfo = peek.getInfo();
|
||||
uiHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
selectAndHandleInfo(streamInfo);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
selectAndLoadVideo(0, peek.getUrl(), !TextUtils.isEmpty(peek.getTitle()) ? peek.getTitle() : "");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -848,7 +875,7 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
}
|
||||
}
|
||||
|
||||
private void handleStreamInfo(@NonNull StreamInfo info, boolean fromNetwork) {
|
||||
private void handleStreamInfo(@NonNull final StreamInfo info, boolean fromNetwork) {
|
||||
if (DEBUG) Log.d(TAG, "handleStreamInfo() called with: info = [" + info + "]");
|
||||
currentStreamInfo = info;
|
||||
selectVideo(info.service_id, info.webpage_url, info.title);
|
||||
|
|
@ -862,7 +889,6 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
|
||||
if (!TextUtils.isEmpty(info.uploader)) uploaderTextView.setText(info.uploader);
|
||||
uploaderTextView.setVisibility(!TextUtils.isEmpty(info.uploader) ? View.VISIBLE : View.GONE);
|
||||
uploaderButton.setVisibility(!TextUtils.isEmpty(info.channel_url) ? View.VISIBLE : View.GONE);
|
||||
uploaderThumb.setImageDrawable(ContextCompat.getDrawable(activity, R.drawable.buddy));
|
||||
|
||||
if (info.view_count >= 0) videoCountView.setText(Localization.localizeViewCount(info.view_count, activity));
|
||||
|
|
@ -887,14 +913,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
thumbsUpImageView.setVisibility(info.like_count >= 0 ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
if (!TextUtils.isEmpty(info.upload_date)) videoUploadDateView.setText(Localization.localizeDate(info.upload_date, activity));
|
||||
videoUploadDateView.setVisibility(!TextUtils.isEmpty(info.upload_date) ? View.VISIBLE : View.GONE);
|
||||
|
||||
if (!TextUtils.isEmpty(info.description)) { //noinspection deprecation
|
||||
videoDescriptionView.setText(Build.VERSION.SDK_INT >= 24 ? Html.fromHtml(info.description, 0) : Html.fromHtml(info.description));
|
||||
}
|
||||
videoDescriptionView.setVisibility(!TextUtils.isEmpty(info.description) ? View.VISIBLE : View.GONE);
|
||||
|
||||
videoDescriptionView.setVisibility(View.GONE);
|
||||
videoDescriptionRootLayout.setVisibility(View.GONE);
|
||||
videoTitleToggleArrow.setImageResource(R.drawable.arrow_down);
|
||||
videoTitleToggleArrow.setVisibility(View.VISIBLE);
|
||||
|
|
@ -903,14 +923,36 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
animateView(spinnerToolbar, true, 500);
|
||||
setupActionBarHandler(info);
|
||||
initThumbnailViews(info);
|
||||
initRelatedVideos(info);
|
||||
if (wasRelatedStreamsExpanded) {
|
||||
toggleExpandRelatedVideos(currentStreamInfo);
|
||||
wasRelatedStreamsExpanded = false;
|
||||
}
|
||||
|
||||
uiHandler.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
initRelatedVideos(info);
|
||||
if (wasRelatedStreamsExpanded) {
|
||||
toggleExpandRelatedVideos(currentStreamInfo);
|
||||
wasRelatedStreamsExpanded = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
setTitleToUrl(info.webpage_url, info.title);
|
||||
setStreamInfoToUrl(info.webpage_url, info);
|
||||
|
||||
|
||||
prepareDescription(info.description);
|
||||
prepareUploadDate(info.upload_date);
|
||||
}
|
||||
private void prepareUploadDate(final String uploadDate) {
|
||||
// Hide until date is prepared or forever if no date is supplied
|
||||
videoUploadDateView.setVisibility(View.GONE);
|
||||
if (!TextUtils.isEmpty(uploadDate)) {
|
||||
backgroundHandler.sendMessage(Message.obtain(backgroundHandler, BackgroundCallback.MESSAGE_UPLOADER_DATE, uploadDate));
|
||||
}
|
||||
}
|
||||
|
||||
private void prepareDescription(final String descriptionHtml) {
|
||||
// Send the unparsed description to the handler as a message
|
||||
if (!TextUtils.isEmpty(descriptionHtml)) {
|
||||
backgroundHandler.sendMessage(Message.obtain(backgroundHandler, BackgroundCallback.MESSAGE_DESCRIPTION, descriptionHtml));
|
||||
}
|
||||
}
|
||||
|
||||
public void playVideo(StreamInfo info) {
|
||||
|
|
@ -987,10 +1029,8 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
int height = isPortrait ? (int) (getResources().getDisplayMetrics().widthPixels / (16.0f / 9.0f))
|
||||
: (int) (getResources().getDisplayMetrics().heightPixels / 2f);
|
||||
thumbnailImageView.setScaleType(isPortrait ? ImageView.ScaleType.CENTER_CROP : ImageView.ScaleType.FIT_CENTER);
|
||||
thumbnailImageView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
|
||||
thumbnailImageView.setLayoutParams(new FrameLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
|
||||
thumbnailImageView.setMinimumHeight(height);
|
||||
thumbnailBackgroundButton.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, height));
|
||||
thumbnailBackgroundButton.setMinimumHeight(height);
|
||||
}
|
||||
|
||||
public String getShortCount(Long viewCount) {
|
||||
|
|
@ -1126,4 +1166,65 @@ public class VideoDetailFragment extends BaseFragment implements StreamExtractor
|
|||
public void onUnrecoverableError(Exception exception) {
|
||||
activity.finish();
|
||||
}
|
||||
|
||||
private static class BackgroundCallback implements Handler.Callback {
|
||||
private static final int MESSAGE_DESCRIPTION = 1;
|
||||
public static final int MESSAGE_UPLOADER_DATE = 2;
|
||||
private final Handler uiHandler;
|
||||
private final Context context;
|
||||
|
||||
BackgroundCallback(Handler uiHandler, Context context) {
|
||||
this.uiHandler = uiHandler;
|
||||
this.context = context;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleMessage(Message msg) {
|
||||
switch (msg.what) {
|
||||
case MESSAGE_DESCRIPTION:
|
||||
handleDescription((String) msg.obj);
|
||||
return true;
|
||||
case MESSAGE_UPLOADER_DATE:
|
||||
handleUploadDate((String) msg.obj);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private void handleUploadDate(String uploadDate) {
|
||||
String localizedDate = Localization.localizeDate(uploadDate, context);
|
||||
uiHandler.sendMessage(Message.obtain(uiHandler, MESSAGE_UPLOADER_DATE, localizedDate));
|
||||
}
|
||||
|
||||
private void handleDescription(String description) {
|
||||
Spanned parsedDescription;
|
||||
if (TextUtils.isEmpty(description)) {
|
||||
return;
|
||||
}
|
||||
if (Build.VERSION.SDK_INT >= 24) {
|
||||
parsedDescription = Html.fromHtml(description, 0);
|
||||
} else {
|
||||
//noinspection deprecation
|
||||
parsedDescription = Html.fromHtml(description);
|
||||
}
|
||||
uiHandler.sendMessage(Message.obtain(uiHandler, MESSAGE_DESCRIPTION, parsedDescription));
|
||||
}
|
||||
}
|
||||
|
||||
private class UICallback implements Handler.Callback {
|
||||
@Override
|
||||
public boolean handleMessage(Message msg) {
|
||||
switch (msg.what) {
|
||||
case BackgroundCallback.MESSAGE_DESCRIPTION:
|
||||
videoDescriptionView.setText((Spanned) msg.obj);
|
||||
videoDescriptionView.setVisibility(View.VISIBLE);
|
||||
return true;
|
||||
case BackgroundCallback.MESSAGE_UPLOADER_DATE:
|
||||
videoUploadDateView.setText((String) msg.obj);
|
||||
videoUploadDateView.setVisibility(View.VISIBLE);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ public class SearchFragment extends BaseFragment implements SuggestionWorker.OnS
|
|||
resultRecyclerView.setLayoutManager(new LinearLayoutManager(activity));
|
||||
|
||||
if (infoListAdapter == null) {
|
||||
infoListAdapter = new InfoListAdapter(getActivity(), getActivity().findViewById(android.R.id.content));
|
||||
infoListAdapter = new InfoListAdapter(getActivity());
|
||||
if (savedInstanceState != null) {
|
||||
//noinspection unchecked
|
||||
ArrayList<InfoItem> serializable = (ArrayList<InfoItem>) savedInstanceState.getSerializable(INFO_LIST_KEY);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue