diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f7bb5a6fa..715680f4f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,7 +24,8 @@
</activity>
<activity
android:name=".VideoItemDetailActivity"
- android:label="@string/title_videoitem_detail" >
+ android:label="@string/title_videoitem_detail"
+ android:theme="@style/AppTheme">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".VideoItemListActivity" />
diff --git a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
index 825f69949..d5fea8c3e 100644
--- a/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/PlayVideoActivity.java
@@ -56,7 +56,6 @@ public class PlayVideoActivity extends AppCompatActivity {
public static final String START_POSITION = "start_position";
private static final long HIDING_DELAY = 3000;
- private static final long TAB_HIDING_DELAY = 100;
private String videoUrl = "";
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfo.java b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
index c7c051945..89e576aae 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
@@ -1,7 +1,5 @@
package org.schabi.newpipe;
-import android.graphics.Bitmap;
-
import org.schabi.newpipe.services.AbstractVideoInfo;
import java.util.List;
@@ -27,11 +25,10 @@ import java.util.List;
*/
/**Info object for opened videos, ie the video ready to play.*/
+@SuppressWarnings("ALL")
public class VideoInfo extends AbstractVideoInfo {
- private static final String TAG = VideoInfo.class.toString();
public String uploader_thumbnail_url = "";
- public Bitmap uploader_thumbnail = null;
public String description = "";
public VideoStream[] videoStreams = null;
public AudioStream[] audioStreams = null;
@@ -89,6 +86,7 @@ public class VideoInfo extends AbstractVideoInfo {
}
}
+ @SuppressWarnings("unused")
public static class AudioStream {
public String url = "";
public int format = -1;
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
index efd752788..c925a40d3 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -27,8 +27,6 @@ import android.widget.TextView;
*/
class VideoInfoItemViewCreator {
- private static final String TAG = VideoInfoItemViewCreator.class.toString();
-
private final LayoutInflater inflater;
public VideoInfoItemViewCreator(LayoutInflater inflater) {
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 84009069a..1a0e75901 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -7,6 +7,7 @@ import android.content.SharedPreferences;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.graphics.Point;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
@@ -27,7 +28,6 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
-import android.widget.ScrollView;
import android.widget.TextView;
import android.view.MenuItem;
@@ -84,6 +84,10 @@ public class VideoItemDetailFragment extends Fragment {
private VideoInfo currentVideoInfo = null;
private boolean showNextVideoItem = false;
+ private View thumbnailWindowLayout;
+ private FloatingActionButton playVideoButton;
+ private final Point initialThumbnailPos = new Point(0, 0);
+
public interface OnInvokeCreateOptionsMenuListener {
void createOptionsMenu();
}
@@ -202,7 +206,7 @@ public class VideoItemDetailFragment extends Fragment {
VideoInfoItemViewCreator videoItemViewCreator =
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);
TextView videoTitleView = (TextView) activity.findViewById(R.id.detailVideoTitleView);
TextView uploaderView = (TextView) activity.findViewById(R.id.detailUploaderView);
@@ -221,7 +225,8 @@ public class VideoItemDetailFragment extends Fragment {
Button nextVideoButton = (Button) activity.findViewById(R.id.detailNextVideoButton);
Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
- contentMainView.setVisibility(View.VISIBLE);
+ textContentLayout.setVisibility(View.VISIBLE);
+ playVideoButton.setVisibility(View.VISIBLE);
progressBar.setVisibility(View.GONE);
if(!showNextVideoItem) {
nextVideoRootFrame.setVisibility(View.GONE);
@@ -239,9 +244,6 @@ public class VideoItemDetailFragment extends Fragment {
viewCountView.setText(
String.format(
res.getString(R.string.viewCountText), localisedViewCount));
- /*viewCountView.setText(localisedViewCount
- + " " + activity.getString(R.string.viewSufix)); */
-
thumbsUpView.setText(nf.format(info.like_count));
thumbsDownView.setText(nf.format(info.dislike_count));
@@ -354,8 +356,11 @@ public class VideoItemDetailFragment extends Fragment {
@Override
public void onActivityCreated(Bundle savedInstanceBundle) {
super.onActivityCreated(savedInstanceBundle);
- FloatingActionButton playVideoButton =
- (FloatingActionButton) getActivity().findViewById(R.id.playVideoButton);
+ Activity a = getActivity();
+ playVideoButton = (FloatingActionButton) a.findViewById(R.id.playVideoButton);
+ thumbnailWindowLayout = a.findViewById(R.id.detailVideoThumbnailWindowLayout);
+ Button backgroundButton = (Button)
+ a.findViewById(R.id.detailVideoThumbnailWindowBackgroundButton);
// Sometimes when this fragment is not visible it still gets initiated
// then we must not try to access objects of this fragment.
@@ -394,6 +399,13 @@ public class VideoItemDetailFragment extends Fragment {
}
});
+ backgroundButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ actionBarHandler.playVideo();
+ }
+ });
+
Button similarVideosButton = (Button) activity.findViewById(R.id.detailShowSimilarButton);
similarVideosButton.setOnClickListener(new View.OnClickListener() {
@Override
@@ -408,9 +420,26 @@ public class VideoItemDetailFragment extends Fragment {
activity.startActivity(intent);
}
});
+
+ ImageView thumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
+ thumbnailView.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+ // This is used to synchronize the thumbnailWindowButton and the playVideoButton
+ // 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) {
+ RelativeLayout.LayoutParams newWindowLayoutParams =
+ (RelativeLayout.LayoutParams) thumbnailWindowLayout.getLayoutParams();
+ newWindowLayoutParams.height = bottom - top;
+ thumbnailWindowLayout.setLayoutParams(newWindowLayoutParams);
+ //noinspection SuspiciousNameCombination
+ initialThumbnailPos.set(top, left);
+ }
+ });
}
}
+
+
/**Returns the java.util.Locale object which corresponds to the locale set in NewPipe's preferences.
* Currently not affected by the device's locale.*/
private Locale getPreferredLocale() {
@@ -418,7 +447,8 @@ public class VideoItemDetailFragment extends Fragment {
String languageKey = getContext().getString(R.string.searchLanguage);
//i know the following line defaults languageCode to "en", but java is picky about uninitialised values
// Schabi: well lint tels me the value is redundant. I'll suppress it for now.
- @SuppressWarnings("UnusedAssignment") String languageCode = "en";
+ @SuppressWarnings("UnusedAssignment")
+ String languageCode = "en";
languageCode = sp.getString(languageKey, "en");
if(languageCode.length() == 2) {
diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
index 75783f416..4e35a5a20 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -33,8 +33,6 @@ import java.util.Vector;
*/
class VideoListAdapter extends BaseAdapter {
- private static final String TAG = VideoListAdapter.class.toString();
-
private final Context context;
private final VideoInfoItemViewCreator viewCreator;
private Vector<VideoPreviewInfo> videoList = new Vector<>();
diff --git a/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java b/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
index 42b0fed6c..98aa42ae5 100644
--- a/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/services/SearchEngine.java
@@ -25,6 +25,7 @@ import java.util.Vector;
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/
+@SuppressWarnings("ALL")
public interface SearchEngine {
diff --git a/app/src/main/java/org/schabi/newpipe/services/ServiceList.java b/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
index 53bba3ffb..da1b293fb 100644
--- a/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
+++ b/app/src/main/java/org/schabi/newpipe/services/ServiceList.java
@@ -26,6 +26,8 @@ import org.schabi.newpipe.services.youtube.YoutubeService;
/**Provides access to the video streaming services supported by NewPipe.
* Currently only Youtube until the API becomes more stable.*/
+
+@SuppressWarnings("ALL")
public class ServiceList {
private static final String TAG = ServiceList.class.toString();
private static final StreamingService[] services = {
diff --git a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
index 01ff361ef..dfe2e161f 100644
--- a/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/services/VideoExtractor.java
@@ -23,6 +23,8 @@ package org.schabi.newpipe.services;
import org.schabi.newpipe.VideoInfo;
/**Scrapes information from a video streaming service (eg, YouTube).*/
+
+@SuppressWarnings("ALL")
public abstract class VideoExtractor {
protected final String pageUrl;
protected VideoInfo videoInfo;
diff --git a/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png b/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png
new file mode 100644
index 000000000..7123a6f01
Binary files /dev/null and b/app/src/main/res/drawable-nodpi/dummy_thumbnail_dark.png differ
diff --git a/app/src/main/res/layout-land/fragment_videoitem_detail.xml b/app/src/main/res/layout-land/fragment_videoitem_detail.xml
deleted file mode 100644
index cde5fde9b..000000000
--- a/app/src/main/res/layout-land/fragment_videoitem_detail.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- tools:context=".VideoItemDetailFragment"
- android:textIsSelectable="true"
- style="?android:attr/textAppearanceLarge"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/videoitem_detail">
-
- <ProgressBar android:id="@+id/detailProgressBar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="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"
- android:contentDescription="@string/detailThumbnailViewDescription"
- android:layout_width="match_parent"
- android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
- android:scaleType="centerInside"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:adjustViewBounds="true"
- android:background="@color/dark_image_background"
- android:src="@drawable/dummy_thumbnail"/>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailThumbnailView"
- android:padding="@dimen/video_item_detail_info_text_padding" >
-
- <TextView android:id="@+id/detailVideoTitleView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textStyle="bold"
- android:paddingBottom="3dp"
- android:textSize="@dimen/video_item_detail_title_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
-
- <ImageView android:id="@+id/detailUploaderThumbnailView"
- android:contentDescription="@string/detailUploaderThumbnailViewDescription"
- android:layout_width="@dimen/video_item_detail_uploader_image_size"
- android:layout_height="@dimen/video_item_detail_uploader_image_size"
- android:layout_below="@id/detailVideoTitleView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:src="@drawable/buddy" />
-
- <TextView android:id="@+id/detailUploaderView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploaderThumbnailView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textStyle="bold"
- android:textSize="@dimen/video_item_detail_uploader_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailViewCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="3dp"
- android:layout_below="@id/detailVideoTitleView"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:textSize="@dimen/video_item_detail_views_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailThumbsDownCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailViewCountView"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:textSize="@dimen/video_item_detail_likes_text_size"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <ImageView android:id="@+id/detailThumbsDownImgView"
- android:contentDescription="@string/detailThumbsDownImgViewDescription"
- android:layout_width="30dp"
- android:layout_height="15dp"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsDownCountView"
- android:layout_toStartOf="@id/detailThumbsDownCountView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:src="@drawable/thumbs_down" />
-
- <TextView android:id="@+id/detailThumbsUpCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsDownImgView"
- android:layout_toStartOf="@id/detailThumbsDownImgView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:textSize="@dimen/video_item_detail_likes_text_size"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
-
- <ImageView android:id="@+id/detailThumbsUpImgView"
- android:contentDescription="@string/detailThumbsUpImgViewDescription"
- android:layout_width="30dp"
- android:layout_height="15dp"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsUpCountView"
- android:layout_toStartOf="@id/detailThumbsUpImgView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:src="@drawable/thumbs_up" />
-
- <TextView android:id="@+id/detailUploadDateView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploaderView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textSize="@dimen/video_item_detail_upload_date_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailDescriptionView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploadDateView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textSize="@dimen/video_item_detail_description_text_size"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- </RelativeLayout>
- </RelativeLayout>
-
- <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/video_item_detail_info_text_padding"
- android:layout_below="@id/detailVideoInfo" >
-
- <TextView android:id="@+id/detailNextVideoTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:textSize="@dimen/video_item_detail_next_text_size"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@android:color/black"
- android:text="@string/nextVideoTitle"
- android:textAllCaps="true" />
-
- <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailNextVideoTitle">
- <FrameLayout
- android:id="@+id/detailNextVideoFrame"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
- <Button
- android:id="@+id/detailNextVideoButton"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignTop="@id/detailNextVideoFrame"
- android:layout_alignBottom="@id/detailNextVideoFrame"
- android:background="?attr/selectableItemBackground"/>
- </RelativeLayout>
- <Button android:id="@+id/detailShowSimilarButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailNextVidButtonAndContantLayout"
- android:text="@string/showSimilarVideosButtonText"/>
- </RelativeLayout>
-
- </RelativeLayout>
- </ScrollView>
-
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/playVideoButton"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:backgroundTint="@color/primaryColorYoutube"
- android:src="@drawable/ic_play_arrow_black"
- android:layout_margin="20dp"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml b/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
deleted file mode 100644
index cde5fde9b..000000000
--- a/app/src/main/res/layout-sw600dp/fragment_videoitem_detail.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- tools:context=".VideoItemDetailFragment"
- android:textIsSelectable="true"
- style="?android:attr/textAppearanceLarge"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:id="@+id/videoitem_detail">
-
- <ProgressBar android:id="@+id/detailProgressBar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="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"
- android:contentDescription="@string/detailThumbnailViewDescription"
- android:layout_width="match_parent"
- android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
- android:scaleType="centerInside"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:adjustViewBounds="true"
- android:background="@color/dark_image_background"
- android:src="@drawable/dummy_thumbnail"/>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailThumbnailView"
- android:padding="@dimen/video_item_detail_info_text_padding" >
-
- <TextView android:id="@+id/detailVideoTitleView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textStyle="bold"
- android:paddingBottom="3dp"
- android:textSize="@dimen/video_item_detail_title_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
-
- <ImageView android:id="@+id/detailUploaderThumbnailView"
- android:contentDescription="@string/detailUploaderThumbnailViewDescription"
- android:layout_width="@dimen/video_item_detail_uploader_image_size"
- android:layout_height="@dimen/video_item_detail_uploader_image_size"
- android:layout_below="@id/detailVideoTitleView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:src="@drawable/buddy" />
-
- <TextView android:id="@+id/detailUploaderView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploaderThumbnailView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textStyle="bold"
- android:textSize="@dimen/video_item_detail_uploader_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailViewCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="3dp"
- android:layout_below="@id/detailVideoTitleView"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:textSize="@dimen/video_item_detail_views_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailThumbsDownCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailViewCountView"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:textSize="@dimen/video_item_detail_likes_text_size"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <ImageView android:id="@+id/detailThumbsDownImgView"
- android:contentDescription="@string/detailThumbsDownImgViewDescription"
- android:layout_width="30dp"
- android:layout_height="15dp"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsDownCountView"
- android:layout_toStartOf="@id/detailThumbsDownCountView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:src="@drawable/thumbs_down" />
-
- <TextView android:id="@+id/detailThumbsUpCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsDownImgView"
- android:layout_toStartOf="@id/detailThumbsDownImgView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:textSize="@dimen/video_item_detail_likes_text_size"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
-
- <ImageView android:id="@+id/detailThumbsUpImgView"
- android:contentDescription="@string/detailThumbsUpImgViewDescription"
- android:layout_width="30dp"
- android:layout_height="15dp"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsUpCountView"
- android:layout_toStartOf="@id/detailThumbsUpImgView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:src="@drawable/thumbs_up" />
-
- <TextView android:id="@+id/detailUploadDateView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploaderView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textSize="@dimen/video_item_detail_upload_date_text_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailDescriptionView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploadDateView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textSize="@dimen/video_item_detail_description_text_size"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- </RelativeLayout>
- </RelativeLayout>
-
- <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="@dimen/video_item_detail_info_text_padding"
- android:layout_below="@id/detailVideoInfo" >
-
- <TextView android:id="@+id/detailNextVideoTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:textSize="@dimen/video_item_detail_next_text_size"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@android:color/black"
- android:text="@string/nextVideoTitle"
- android:textAllCaps="true" />
-
- <RelativeLayout android:id="@+id/detailNextVidButtonAndContantLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailNextVideoTitle">
- <FrameLayout
- android:id="@+id/detailNextVideoFrame"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
- <Button
- android:id="@+id/detailNextVideoButton"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignTop="@id/detailNextVideoFrame"
- android:layout_alignBottom="@id/detailNextVideoFrame"
- android:background="?attr/selectableItemBackground"/>
- </RelativeLayout>
- <Button android:id="@+id/detailShowSimilarButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailNextVidButtonAndContantLayout"
- android:text="@string/showSimilarVideosButtonText"/>
- </RelativeLayout>
-
- </RelativeLayout>
- </ScrollView>
-
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/playVideoButton"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:backgroundTint="@color/primaryColorYoutube"
- android:src="@drawable/ic_play_arrow_black"
- android:layout_margin="20dp"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
new file mode 100644
index 000000000..302086667
--- /dev/null
+++ b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ tools:context=".VideoItemDetailFragment"
+ android:textIsSelectable="true"
+ style="?android:attr/textAppearanceLarge"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/videoitem_detail">
+
+ <ImageView android:id="@+id/detailThumbnailView"
+ android:contentDescription="@string/detailThumbnailViewDescription"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scaleType="fitCenter"
+ android:adjustViewBounds="true"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentTop="true"
+ android:background="@android:color/black"
+ android:src="@drawable/dummy_thumbnail_dark"/>
+
+ <ScrollView
+ android:id="@+id/detailMainContent"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="visible">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <RelativeLayout
+ android:id="@+id/detailVideoThumbnailWindowLayout"
+ android:layout_width="match_parent"
+ android:layout_height="250dp"
+ android:background="?attr/selectableItemBackground">
+
+ <ProgressBar android:id="@+id/detailProgressBar"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:indeterminate="true"
+ android:indeterminateTint="@color/primaryColorDarkYoutube"
+ android:indeterminateTintMode="src_in"/>
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/playVideoButton"
+ android:visibility="invisible"
+ android:layout_width="wrap_content"
+
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ app:backgroundTint="@color/primaryColorYoutube"
+ android:src="@drawable/ic_play_arrow_black"
+ android:layout_margin="20dp"/>
+
+ <Button
+ android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/selectableItemBackground"/>
+
+ </RelativeLayout>
+
+ <RelativeLayout android:id="@+id/detailTextContentLayout"
+ android:visibility="invisible"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="5dp"
+ android:paddingBottom="5dp"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:layout_below="@id/detailVideoThumbnailWindowLayout"
+ android:background="@color/background_gray">
+
+ <TextView android:id="@+id/detailVideoTitleView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:textStyle="bold"
+ android:paddingBottom="3dp"
+ android:textSize="@dimen/text_video_title_size"
+ android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+ <ImageView android:id="@+id/detailUploaderThumbnailView"
+ android:contentDescription="@string/detailUploaderThumbnailViewDescription"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:layout_below="@id/detailVideoTitleView"
+ android:layout_alignParentStart="true"
+ android:src="@drawable/buddy" />
+
+ <TextView android:id="@+id/detailUploaderView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailUploaderThumbnailView"
+ android:layout_alignParentStart="true"
+ android:textStyle="bold"
+ android:textSize="@dimen/text_video_uploader_size"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView android:id="@+id/detailViewCountView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="3dp"
+ android:layout_below="@id/detailVideoTitleView"
+ android:layout_alignParentEnd="true"
+ android:textSize="@dimen/text_video_views_size"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView android:id="@+id/detailThumbsDownCountView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_alignParentEnd="true"
+ android:textSize="@dimen/text_video_like_size"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <ImageView android:id="@+id/detailThumbsDownImgView"
+ android:contentDescription="@string/detailThumbsDownImgViewDescription"
+ android:layout_width="30dp"
+ android:layout_height="15dp"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_toStartOf="@id/detailThumbsDownCountView"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:src="@drawable/thumbs_down" />
+
+ <TextView android:id="@+id/detailThumbsUpCountView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_toStartOf="@id/detailThumbsDownImgView"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:textSize="@dimen/text_video_like_size"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+ <ImageView android:id="@+id/detailThumbsUpImgView"
+ android:contentDescription="@string/detailThumbsUpImgViewDescription"
+ android:layout_width="30dp"
+ android:layout_height="15dp"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_toStartOf="@id/detailThumbsUpCountView"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:src="@drawable/thumbs_up" />
+
+ <TextView android:id="@+id/detailUploadDateView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailUploaderView"
+ android:layout_alignParentStart="true"
+ android:textSize="@dimen/text_video_upload_date_size"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView android:id="@+id/detailDescriptionView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailUploadDateView"
+ android:layout_alignParentStart="true"
+ android:textSize="@dimen/text_video_description_size"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+ <RelativeLayout
+ android:id="@+id/detailNextVideoRootLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:layout_below="@id/detailDescriptionView" >
+
+ <TextView android:id="@+id/detailNextVideoTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:textSize="@dimen/text_video_upload_date_size"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@android:color/black"
+ android:text="@string/nextVideoTitle"
+ />
+ <FrameLayout
+ android:id="@+id/detailNextVideoFrame"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailNextVideoTitle"/>
+ <Button
+ android:id="@+id/detailNextVideoButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignTop="@id/detailNextVideoFrame"
+ android:layout_alignBottom="@id/detailNextVideoFrame"
+ android:background="?attr/selectableItemBackground"/>
+ </RelativeLayout>
+
+ <Button android:id="@+id/detailShowSimilarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
+ android:layout_below="@id/detailNextVideoRootLayout"
+ android:text="@string/showSimilarVideosButtonText"/>
+ </RelativeLayout>
+ </RelativeLayout>
+ </ScrollView>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_videoitem_detail.xml b/app/src/main/res/layout/fragment_videoitem_detail.xml
index cd668ae1c..31f2ae0a3 100644
--- a/app/src/main/res/layout/fragment_videoitem_detail.xml
+++ b/app/src/main/res/layout/fragment_videoitem_detail.xml
@@ -8,26 +8,19 @@
style="?android:attr/textAppearanceLarge"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/videoitem_detail"
- android:background="@color/background_gray">
-
- <ProgressBar android:id="@+id/detailProgressBar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:indeterminate="true"/>
+ android:id="@+id/videoitem_detail">
<ImageView android:id="@+id/detailThumbnailView"
android:contentDescription="@string/detailThumbnailViewDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:scaleType="centerInside"
+ android:scaleType="fitCenter"
+ android:adjustViewBounds="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:adjustViewBounds="true"
android:background="@android:color/black"
- android:src="@drawable/dummy_thumbnail"/>
+ android:src="@drawable/dummy_thumbnail_dark"/>
<ScrollView
android:id="@+id/detailMainContent"
@@ -39,184 +32,192 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <RelativeLayout android:id="@+id/detailVideoInfo"
+ <RelativeLayout
+ android:id="@+id/detailVideoThumbnailWindowLayout"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="250dp"
+ android:background="?attr/selectableItemBackground">
- <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"
+ <ProgressBar android:id="@+id/detailProgressBar"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@id/detailVideoThumbnailWindow"
- android:paddingTop="5dp"
- android:paddingBottom="5dp"
+ android:layout_centerInParent="true"
+ android:indeterminate="true"/>
+
+ <android.support.design.widget.FloatingActionButton
+ android:id="@+id/playVideoButton"
+ android:visibility="invisible"
+ android:layout_width="wrap_content"
+
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ app:backgroundTint="@color/primaryColorYoutube"
+ android:src="@drawable/ic_play_arrow_black"
+ android:layout_margin="20dp"/>
+
+ <Button
+ android:id="@+id/detailVideoThumbnailWindowBackgroundButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/selectableItemBackground"/>
+
+ </RelativeLayout>
+
+ <RelativeLayout android:id="@+id/detailTextContentLayout"
+ android:visibility="invisible"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="5dp"
+ android:paddingBottom="5dp"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:layout_below="@id/detailVideoThumbnailWindowLayout"
+ android:background="@color/background_gray">
+
+ <TextView android:id="@+id/detailVideoTitleView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:textStyle="bold"
+ android:paddingBottom="3dp"
+ android:textSize="@dimen/text_video_title_size"
+ android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+ <ImageView android:id="@+id/detailUploaderThumbnailView"
+ android:contentDescription="@string/detailUploaderThumbnailViewDescription"
+ android:layout_width="80dp"
+ android:layout_height="80dp"
+ android:layout_below="@id/detailVideoTitleView"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:src="@drawable/buddy" />
+
+ <TextView android:id="@+id/detailUploaderView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailUploaderThumbnailView"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:textStyle="bold"
+ android:textSize="@dimen/text_video_uploader_size"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView android:id="@+id/detailViewCountView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="3dp"
+ android:layout_below="@id/detailVideoTitleView"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:textSize="@dimen/text_video_views_size"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView android:id="@+id/detailThumbsDownCountView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:textSize="@dimen/text_video_like_size"
android:paddingRight="5dp"
android:paddingLeft="5dp"
- android:background="@color/background_gray">
+ android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView android:id="@+id/detailVideoTitleView"
+ <ImageView android:id="@+id/detailThumbsDownImgView"
+ android:contentDescription="@string/detailThumbsDownImgViewDescription"
+ android:layout_width="30dp"
+ android:layout_height="15dp"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_toLeftOf="@id/detailThumbsDownCountView"
+ android:layout_toStartOf="@id/detailThumbsDownCountView"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:src="@drawable/thumbs_down" />
+
+ <TextView android:id="@+id/detailThumbsUpCountView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_toLeftOf="@id/detailThumbsDownImgView"
+ android:layout_toStartOf="@id/detailThumbsDownImgView"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:textSize="@dimen/text_video_like_size"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+ <ImageView android:id="@+id/detailThumbsUpImgView"
+ android:contentDescription="@string/detailThumbsUpImgViewDescription"
+ android:layout_width="30dp"
+ android:layout_height="15dp"
+ android:layout_below="@id/detailViewCountView"
+ android:layout_toLeftOf="@id/detailThumbsUpCountView"
+ android:layout_toStartOf="@id/detailThumbsUpImgView"
+ android:paddingRight="5dp"
+ android:paddingLeft="5dp"
+ android:src="@drawable/thumbs_up" />
+
+ <TextView android:id="@+id/detailUploadDateView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailUploaderView"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:textSize="@dimen/text_video_upload_date_size"
+ android:textAppearance="?android:attr/textAppearanceLarge" />
+
+ <TextView android:id="@+id/detailDescriptionView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detailUploadDateView"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:textSize="@dimen/text_video_description_size"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+ <RelativeLayout
+ android:id="@+id/detailNextVideoRootLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="10dp"
+ android:paddingBottom="10dp"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:layout_below="@id/detailDescriptionView" >
+
+ <TextView android:id="@+id/detailNextVideoTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:textStyle="bold"
- android:paddingBottom="3dp"
- android:textSize="@dimen/text_video_title_size"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
-
- <ImageView android:id="@+id/detailUploaderThumbnailView"
- android:contentDescription="@string/detailUploaderThumbnailViewDescription"
- android:layout_width="80dp"
- android:layout_height="80dp"
- android:layout_below="@id/detailVideoTitleView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:src="@drawable/buddy" />
-
- <TextView android:id="@+id/detailUploaderView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploaderThumbnailView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textStyle="bold"
- android:textSize="@dimen/text_video_uploader_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailViewCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="3dp"
- android:layout_below="@id/detailVideoTitleView"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:textSize="@dimen/text_video_views_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailThumbsDownCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailViewCountView"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:textSize="@dimen/text_video_like_size"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <ImageView android:id="@+id/detailThumbsDownImgView"
- android:contentDescription="@string/detailThumbsDownImgViewDescription"
- android:layout_width="30dp"
- android:layout_height="15dp"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsDownCountView"
- android:layout_toStartOf="@id/detailThumbsDownCountView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:src="@drawable/thumbs_down" />
-
- <TextView android:id="@+id/detailThumbsUpCountView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsDownImgView"
- android:layout_toStartOf="@id/detailThumbsDownImgView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:textSize="@dimen/text_video_like_size"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
-
- <ImageView android:id="@+id/detailThumbsUpImgView"
- android:contentDescription="@string/detailThumbsUpImgViewDescription"
- android:layout_width="30dp"
- android:layout_height="15dp"
- android:layout_below="@id/detailViewCountView"
- android:layout_toLeftOf="@id/detailThumbsUpCountView"
- android:layout_toStartOf="@id/detailThumbsUpImgView"
- android:paddingRight="5dp"
- android:paddingLeft="5dp"
- android:src="@drawable/thumbs_up" />
-
- <TextView android:id="@+id/detailUploadDateView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploaderView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
android:textSize="@dimen/text_video_upload_date_size"
- android:textAppearance="?android:attr/textAppearanceLarge" />
-
- <TextView android:id="@+id/detailDescriptionView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailUploadDateView"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textSize="@dimen/text_video_description_size"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
-
- <RelativeLayout
- android:id="@+id/detailNextVideoRootLayout"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@android:color/black"
+ android:text="@string/nextVideoTitle"
+ />
+ <FrameLayout
+ android:id="@+id/detailNextVideoFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="10dp"
- android:paddingBottom="10dp"
- android:paddingLeft="5dp"
- android:paddingRight="5dp"
- android:layout_below="@id/detailDescriptionView" >
-
- <TextView android:id="@+id/detailNextVideoTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:textSize="@dimen/text_video_upload_date_size"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@android:color/black"
- android:text="@string/nextVideoTitle"
- />
- <FrameLayout
- android:id="@+id/detailNextVideoFrame"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detailNextVideoTitle"/>
- <Button
- android:id="@+id/detailNextVideoButton"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignTop="@id/detailNextVideoFrame"
- android:layout_alignBottom="@id/detailNextVideoFrame"
- android:background="?attr/selectableItemBackground"/>
- </RelativeLayout>
-
- <Button android:id="@+id/detailShowSimilarButton"
+ android:layout_below="@id/detailNextVideoTitle"/>
+ <Button
+ android:id="@+id/detailNextVideoButton"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="6dp"
- android:layout_below="@id/detailNextVideoRootLayout"
- android:text="@string/showSimilarVideosButtonText"/>
-
+ android:layout_height="match_parent"
+ android:layout_alignTop="@id/detailNextVideoFrame"
+ android:layout_alignBottom="@id/detailNextVideoFrame"
+ android:background="?attr/selectableItemBackground"/>
</RelativeLayout>
+
+ <Button android:id="@+id/detailShowSimilarButton"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="6dp"
+ android:layout_marginRight="6dp"
+ android:layout_below="@id/detailNextVideoRootLayout"
+ android:text="@string/showSimilarVideosButtonText"/>
</RelativeLayout>
</RelativeLayout>
</ScrollView>
-
- <android.support.design.widget.FloatingActionButton
- android:id="@+id/playVideoButton"
- android:visibility="visible"
- android:layout_alignParentBottom="true"
- android:layout_centerHorizontal="true"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:backgroundTint="@color/primaryColorYoutube"
- android:src="@drawable/ic_play_arrow_black"
- android:layout_margin="20dp"/>
-
</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index b8610dc79..1f056cfb5 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -7,6 +7,7 @@
<item name="android:colorPrimaryDark">@color/primaryColorDarkYoutube</item>
<item name="colorAccent">@color/accentColorYoutube</item>
<item name="android:colorAccent">@color/accentColorYoutube</item>
+ <item name="android:windowBackground">@color/background_gray</item>
</style>
<style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index aee88f5f5..a35724980 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,5 @@
<color name="durationText">#efff</color>
<color name="dark_overlay">#6000</color>
<color name="dark_image_background">#222</color>
+ <color name="background_gray">#EEEEEE</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1126073b0..8d27cc3df 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
<item name="colorPrimary">@color/primaryColorYoutube</item>
<item name="colorPrimaryDark">@color/primaryColorDarkYoutube</item>
<item name="colorAccent">@color/accentColorYoutube</item>
+ <item name="android:windowBackground">@color/background_gray</item>
</style>
<style name="NewPipeActionbarTheme" parent="Widget.AppCompat.Light.ActionBar.Solid" >