lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

made content scroll over thumbnail

This commit is contained in:
Christian Schabesberger 2015-12-02 21:20:52 +01:00
parent 2e4e993967
commit 78b95f67eb
3 changed files with 88 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
View File

@ -84,6 +84,9 @@ public class VideoItemDetailFragment extends Fragment {
private VideoInfo currentVideoInfo = null; private VideoInfo currentVideoInfo = null;
private boolean showNextVideoItem = false; private boolean showNextVideoItem = false;
private View thumbnailWindow;
public interface OnInvokeCreateOptionsMenuListener { public interface OnInvokeCreateOptionsMenuListener {
void createOptionsMenu(); void createOptionsMenu();
} }
@ -202,7 +205,7 @@ public class VideoItemDetailFragment extends Fragment {
VideoInfoItemViewCreator videoItemViewCreator = VideoInfoItemViewCreator videoItemViewCreator =
new VideoInfoItemViewCreator(LayoutInflater.from(getActivity())); new VideoInfoItemViewCreator(LayoutInflater.from(getActivity()));
ScrollView contentMainView = (ScrollView) activity.findViewById(R.id.detailMainContent); RelativeLayout textContentLayout = (RelativeLayout) activity.findViewById(R.id.detailTextContentLayout);
ProgressBar progressBar = (ProgressBar) activity.findViewById(R.id.detailProgressBar); ProgressBar progressBar = (ProgressBar) activity.findViewById(R.id.detailProgressBar);
TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView); TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView);
TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView); TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView);
@ -221,7 +224,7 @@ public class VideoItemDetailFragment extends Fragment {
Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton); Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton); Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
contentMainView.setVisibility(View.VISIBLE); textContentLayout.setVisibility(View.VISIBLE);
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
if(!showNextVideoItem) { if(!showNextVideoItem) {
nextVideoRootFrame.setVisibility(View.GONE); nextVideoRootFrame.setVisibility(View.GONE);
@ -239,8 +242,6 @@ public class VideoItemDetailFragment extends Fragment {
viewCountView.setText( viewCountView.setText(
String.format( String.format(
res.getString(R.string.viewCountText), localisedViewCount)); res.getString(R.string.viewCountText), localisedViewCount));
/*viewCountView.setText(localisedViewCount
+ " " + activity.getString(R.string.viewSufix)); */
thumbsUpView.setText(nf.format(info.like_count)); thumbsUpView.setText(nf.format(info.like_count));
@ -336,6 +337,7 @@ public class VideoItemDetailFragment extends Fragment {
activity = (AppCompatActivity) getActivity(); activity = (AppCompatActivity) getActivity();
showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity()) showNextVideoItem = PreferenceManager.getDefaultSharedPreferences(getActivity())
.getBoolean(activity.getString(R.string.showNextVideo), true); .getBoolean(activity.getString(R.string.showNextVideo), true);
} }
@Override @Override
@ -408,6 +410,19 @@ public class VideoItemDetailFragment extends Fragment {
activity.startActivity(intent); activity.startActivity(intent);
} }
}); });
ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
thumbnailWindow = activity.findViewById(R.id.detailVideoThumbnailWindow);
thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
// This is used to synchronize the thumbnailWindow inside the ScrollView with
// the actual size of the thumbnail.
@Override
public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
Log.d(TAG, Integer.toString(right - left) + " : " + Integer.toString(bottom - top));
RelativeLayout.LayoutParams newLayoutParams = new RelativeLayout.LayoutParams(right - left, bottom - top);
thumbnailWindow.setLayoutParams(newLayoutParams);
}
});
} }
} }

64
app/src/main/res/layout/fragment_videoitem_detail.xml
View File

@ -8,7 +8,8 @@
style="?android:attr/textAppearanceLarge" style="?android:attr/textAppearanceLarge"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/videoitem_detail"> android:id="@+id/videoitem_detail"
android:background="@color/background_gray">
<ProgressBar android:id="@+id/detailProgressBar" <ProgressBar android:id="@+id/detailProgressBar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -16,20 +17,6 @@
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:indeterminate="true"/> android:indeterminate="true"/>
<ScrollView
android:id="@+id/detailMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout android:id="@+id/detailVideoInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView android:id="@+id/detailThumbnailView" <ImageView android:id="@+id/detailThumbnailView"
android:contentDescription="@string/detailThumbnailViewDescription" android:contentDescription="@string/detailThumbnailViewDescription"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -39,16 +26,38 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:background="@android:color/black"
android:src="@drawable/dummy_thumbnail"/> android:src="@drawable/dummy_thumbnail"/>
<ScrollView
android:id="@+id/detailMainContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="visible">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout android:id="@+id/detailVideoInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<View android:id="@+id/detailVideoThumbnailWindow"
android:layout_width="match_parent"
android:layout_height="250dp"
android:background="@android:color/transparent" />
<RelativeLayout android:id="@+id/detailTextContentLayout"
android:visibility="invisible"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/detailThumbnailView" android:layout_below="@id/detailVideoThumbnailWindow"
android:paddingTop="5dp" android:paddingTop="5dp"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingLeft="5dp"> android:paddingLeft="5dp"
android:background="@color/background_gray">
<TextView android:id="@+id/detailVideoTitleView" <TextView android:id="@+id/detailVideoTitleView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -151,17 +160,16 @@
android:textSize="@dimen/text_video_description_size" android:textSize="@dimen/text_video_description_size"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
</RelativeLayout>
</RelativeLayout>
<RelativeLayout android:id="@+id/detailNextVideoRootLayout" <RelativeLayout
android:id="@+id/detailNextVideoRootLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:layout_below="@id/detailVideoInfo" > android:layout_below="@id/detailDescriptionView" >
<TextView android:id="@+id/detailNextVideoTitle" <TextView android:id="@+id/detailNextVideoTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -173,15 +181,11 @@
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:text="@string/nextVideoTitle" android:text="@string/nextVideoTitle"
/> />
<RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/detailNextVideoTitle">
<FrameLayout <FrameLayout
android:id="@+id/detailNextVideoFrame" android:id="@+id/detailNextVideoFrame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:layout_below="@id/detailNextVideoTitle"/>
<Button <Button
android:id="@+id/detailNextVideoButton" android:id="@+id/detailNextVideoButton"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -190,7 +194,6 @@
android:layout_alignBottom="@id/detailNextVideoFrame" android:layout_alignBottom="@id/detailNextVideoFrame"
android:background="?attr/selectableItemBackground"/> android:background="?attr/selectableItemBackground"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout>
<Button android:id="@+id/detailShowSimilarButton" <Button android:id="@+id/detailShowSimilarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -199,11 +202,15 @@
android:layout_marginRight="6dp" android:layout_marginRight="6dp"
android:layout_below="@id/detailNextVideoRootLayout" android:layout_below="@id/detailNextVideoRootLayout"
android:text="@string/showSimilarVideosButtonText"/> android:text="@string/showSimilarVideosButtonText"/>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
</ScrollView> </ScrollView>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/playVideoButton" android:id="@+id/playVideoButton"
android:visibility="visible"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -211,4 +218,5 @@
app:backgroundTint="@color/primaryColorYoutube" app:backgroundTint="@color/primaryColorYoutube"
android:src="@drawable/ic_play_arrow_black" android:src="@drawable/ic_play_arrow_black"
android:layout_margin="20dp"/> android:layout_margin="20dp"/>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/values/colors.xml
View File

@ -6,4 +6,5 @@
<color name="durationBackground">#aa000000</color> <color name="durationBackground">#aa000000</color>
<color name="durationText">#eeffffff</color> <color name="durationText">#eeffffff</color>
<color name="black_overlay">#66000000</color> <color name="black_overlay">#66000000</color>
<color name="background_gray">#EEEEEE</color>
</resources> </resources>