From 9a073713bb715e13d4bdf706048354bb62f37e23 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Wed, 25 Oct 2017 15:20:57 +0200
Subject: [PATCH] put tabs on top
---
.../fragments/list/feed/FeedFragment.java | 2 +-
.../subscription/SubscriptionFragment.java | 1 +
app/src/main/res/layout/fragment_blank.xml | 6 +
app/src/main/res/layout/fragment_channel.xml | 6 +
app/src/main/res/layout/fragment_feed.xml | 6 +
app/src/main/res/layout/fragment_kiosk.xml | 7 +
app/src/main/res/layout/fragment_main.xml | 5 +-
app/src/main/res/layout/fragment_playlist.xml | 6 +
app/src/main/res/layout/fragment_search.xml | 6 +
.../main/res/layout/fragment_subscription.xml | 6 +
.../main/res/layout/fragment_video_detail.xml | 682 +++++++++---------
app/src/main/res/layout/toolbar_layout.xml | 5 -
12 files changed, 395 insertions(+), 343 deletions(-)
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java
index 379ec591a..835647eec 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/feed/FeedFragment.java
@@ -121,7 +121,7 @@ public class FeedFragment extends BaseListFragment<List<SubscriptionEntity>, Voi
}
if(useAsFrontPage) {
- supportActionBar.setDisplayHomeAsUpEnabled(false);
+ supportActionBar.setDisplayShowTitleEnabled(true);
//supportActionBar.setDisplayShowTitleEnabled(false);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java
index afb2f078e..3ff56a163 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/subscription/SubscriptionFragment.java
@@ -62,6 +62,7 @@ public class SubscriptionFragment extends BaseStateFragment<List<SubscriptionEnt
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+ activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
activity.setTitle(R.string.tab_subscriptions);
return inflater.inflate(R.layout.fragment_subscription, container, false);
diff --git a/app/src/main/res/layout/fragment_blank.xml b/app/src/main/res/layout/fragment_blank.xml
index ad91b1d1d..d1167d722 100644
--- a/app/src/main/res/layout/fragment_blank.xml
+++ b/app/src/main/res/layout/fragment_blank.xml
@@ -16,4 +16,10 @@
android:layout_marginTop="50dp"
android:visibility="gone" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+
</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 460f95a7a..67691fc81 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -62,4 +62,10 @@
android:visibility="gone"
tools:visibility="visible"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
index 0f2d0b675..0868d8233 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -34,4 +34,10 @@
android:visibility="gone"
tools:visibility="visible"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+
</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_kiosk.xml b/app/src/main/res/layout/fragment_kiosk.xml
index a85c30cb1..4730e66c8 100644
--- a/app/src/main/res/layout/fragment_kiosk.xml
+++ b/app/src/main/res/layout/fragment_kiosk.xml
@@ -4,6 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
+
<android.support.v7.widget.RecyclerView
android:id="@+id/items_list"
android:layout_width="match_parent"
@@ -61,4 +62,10 @@
android:visibility="gone"
tools:visibility="visible"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+
</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index dac5478ff..b1dd3e20b 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -10,13 +10,14 @@
android:id="@+id/main_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
+ android:layout_alignParentTop="true"
+ android:background="@color/dark_youtube_primary_color"
app:tabGravity="fill"/>
<android.support.v4.view.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="fill_parent"
- android:layout_above="@id/main_tab_layout"/>
+ android:layout_below="@id/main_tab_layout"/>
</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_playlist.xml b/app/src/main/res/layout/fragment_playlist.xml
index d5ef26a63..37c609fa4 100644
--- a/app/src/main/res/layout/fragment_playlist.xml
+++ b/app/src/main/res/layout/fragment_playlist.xml
@@ -62,4 +62,10 @@
android:visibility="gone"
tools:visibility="visible"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 04b10347c..d49d23175 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -81,4 +81,10 @@
android:visibility="gone"
tools:visibility="visible"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+
</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_subscription.xml b/app/src/main/res/layout/fragment_subscription.xml
index 35cfbfeb7..e0d0348dc 100644
--- a/app/src/main/res/layout/fragment_subscription.xml
+++ b/app/src/main/res/layout/fragment_subscription.xml
@@ -35,4 +35,10 @@
android:visibility="gone"
tools:visibility="visible"/>
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+
</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 0d87809fc..b067db7bc 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -1,345 +1,308 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/video_item_detail"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:focusableInTouchMode="true">
-
- <com.nirhart.parallaxscroll.views.ParallaxScrollView
- android:id="@+id/detail_main_content"
+ android:layout_height="match_parent">
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:visibility="visible"
- app:parallax_factor="1.9">
+ android:focusableInTouchMode="true">
- <!--WRAPPER-->
- <LinearLayout
+ <com.nirhart.parallaxscroll.views.ParallaxScrollView
+ android:id="@+id/detail_main_content"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:layout_height="match_parent"
+ android:visibility="visible"
+ app:parallax_factor="1.9">
- <!-- THUMBNAIL -->
- <FrameLayout
- android:id="@+id/detail_thumbnail_root_layout"
+ <!--WRAPPER-->
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@android:color/black"
- android:clickable="true"
- android:foreground="?attr/selectableItemBackground">
+ android:orientation="vertical">
- <ImageView
- android:id="@+id/detail_thumbnail_image_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@android:color/transparent"
- android:contentDescription="@string/detail_thumbnail_view_description"
- android:scaleType="centerCrop"
- tools:ignore="RtlHardcoded"
- tools:layout_height="200dp"
- tools:src="@drawable/dummy_thumbnail"/>
-
- <ImageView
- android:id="@+id/detail_thumbnail_play_button"
- android:layout_width="64dp"
- android:layout_height="64dp"
- android:layout_gravity="center"
- android:background="@android:color/transparent"
- android:src="@drawable/new_play_arrow"
- android:visibility="invisible"
- tools:ignore="ContentDescription"
- tools:visibility="visible"/>
-
- </FrameLayout>
-
- <!-- CONTENT -->
- <RelativeLayout
- android:id="@+id/detail_content_root_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="?android:windowBackground">
-
- <!-- TITLE -->
+ <!-- THUMBNAIL -->
<FrameLayout
- android:id="@+id/detail_title_root_layout"
+ android:id="@+id/detail_thumbnail_root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground"
+ android:background="@android:color/black"
android:clickable="true"
- android:paddingLeft="12dp"
- android:paddingRight="12dp">
-
- <TextView
- android:id="@+id/detail_video_title_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginRight="20dp"
- android:ellipsize="end"
- android:maxLines="1"
- android:paddingBottom="8dp"
- android:paddingTop="12dp"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/video_item_detail_title_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero."/>
+ android:foreground="?attr/selectableItemBackground">
<ImageView
- android:id="@+id/detail_toggle_description_view"
- android:layout_width="15dp"
- android:layout_height="15dp"
- android:layout_gravity="center_vertical|right"
- android:layout_marginLeft="5dp"
- android:src="@drawable/arrow_down"
- tools:ignore="ContentDescription,RtlHardcoded"/>
+ android:id="@+id/detail_thumbnail_image_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@android:color/transparent"
+ android:contentDescription="@string/detail_thumbnail_view_description"
+ android:scaleType="centerCrop"
+ tools:ignore="RtlHardcoded"
+ tools:layout_height="200dp"
+ tools:src="@drawable/dummy_thumbnail"/>
+
+ <ImageView
+ android:id="@+id/detail_thumbnail_play_button"
+ android:layout_width="64dp"
+ android:layout_height="64dp"
+ android:layout_gravity="center"
+ android:background="@android:color/transparent"
+ android:src="@drawable/new_play_arrow"
+ android:visibility="invisible"
+ tools:ignore="ContentDescription"
+ tools:visibility="visible"/>
</FrameLayout>
- <!-- LOADING INDICATOR-->
- <ProgressBar
- android:id="@+id/loading_progress_bar"
- style="@style/Widget.AppCompat.ProgressBar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detail_title_root_layout"
- android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
- android:indeterminate="true"
- android:visibility="gone"
- tools:visibility="visible"/>
-
- <!--ERROR PANEL-->
- <include
- android:id="@+id/error_panel"
- layout="@layout/error_retry"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/detail_title_root_layout"
- android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
- android:visibility="gone"
- tools:visibility="visible"/>
-
- <!--HIDING ROOT-->
- <LinearLayout
- android:id="@+id/detail_content_root_hiding"
+ <!-- CONTENT -->
+ <RelativeLayout
+ android:id="@+id/detail_content_root_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_below="@+id/detail_title_root_layout"
- android:orientation="vertical"
- android:visibility="gone"
- tools:visibility="visible">
+ android:background="?android:windowBackground">
- <!--DETAIL-->
- <RelativeLayout
- android:id="@+id/detail_root"
- android:layout_width="match_parent"
- android:layout_height="55dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:layout_marginTop="6dp"
- android:baselineAligned="false"
- android:orientation="horizontal">
-
- <!-- VIEW & THUMBS -->
- <TextView
- android:id="@+id/detail_view_count_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_marginBottom="6dp"
- android:layout_marginTop="6dp"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/video_item_detail_views_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="2,816,821,505 views"/>
-
- <ImageView
- android:id="@+id/detail_thumbs_up_img_view"
- android:layout_width="@dimen/video_item_detail_like_image_width"
- android:layout_height="@dimen/video_item_detail_like_image_height"
- android:layout_below="@id/detail_view_count_view"
- android:contentDescription="@string/detail_likes_img_view_description"
- android:src="?attr/thumbs_up"/>
-
- <TextView
- android:id="@+id/detail_thumbs_up_count_view"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/video_item_detail_like_image_height"
- android:layout_below="@id/detail_view_count_view"
- android:layout_marginLeft="@dimen/video_item_detail_like_margin"
- android:layout_toRightOf="@id/detail_thumbs_up_img_view"
- android:gravity="center_vertical"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="@dimen/video_item_detail_likes_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="12M"/>
-
- <ImageView
- android:id="@+id/detail_thumbs_down_img_view"
- android:layout_width="@dimen/video_item_detail_like_image_width"
- android:layout_height="@dimen/video_item_detail_like_image_height"
- android:layout_below="@id/detail_view_count_view"
- android:layout_marginLeft="12dp"
- android:layout_toRightOf="@id/detail_thumbs_up_count_view"
- android:contentDescription="@string/detail_dislikes_img_view_description"
- android:src="?attr/thumbs_down"
- tools:ignore="RtlHardcoded"/>
-
- <TextView
- android:id="@+id/detail_thumbs_down_count_view"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/video_item_detail_like_image_height"
- android:layout_below="@id/detail_view_count_view"
- android:layout_marginLeft="@dimen/video_item_detail_like_margin"
- android:layout_toRightOf="@id/detail_thumbs_down_img_view"
- android:gravity="center_vertical"
- android:lines="1"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="@dimen/video_item_detail_likes_text_size"
- tools:ignore="RtlHardcoded"
- tools:text="10K"/>
-
- <TextView
- android:id="@+id/detail_thumbs_disabled_view"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/video_item_detail_like_image_height"
- android:layout_below="@id/detail_view_count_view"
- android:layout_marginLeft="12dp"
- android:layout_toRightOf="@id/detail_thumbs_down_img_view"
- android:gravity="center_vertical"
- android:text="@string/disabled"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/video_item_detail_likes_text_size"
- android:textStyle="bold"
- android:visibility="gone"
- tools:ignore="RtlHardcoded"
- tools:visibility="visible"/>
-
- <!-- CONTROLS -->
- <TextView
- android:id="@+id/detail_controls_popup"
- android:layout_width="80dp"
- android:layout_height="55dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_gravity="center_vertical"
- android:background="?attr/selectableItemBackgroundBorderless"
- android:clickable="true"
- android:contentDescription="@string/open_in_popup_mode"
- android:drawableTop="?attr/popup"
- android:gravity="center"
- android:paddingBottom="6dp"
- android:paddingTop="6dp"
- android:text="@string/controls_popup_title"
- android:textSize="12sp"/>
-
- <TextView
- android:id="@+id/detail_controls_background"
- android:layout_width="80dp"
- android:layout_height="55dp"
- android:layout_alignParentTop="true"
- android:layout_gravity="center_vertical"
- android:layout_toLeftOf="@id/detail_controls_popup"
- android:background="?attr/selectableItemBackgroundBorderless"
- android:clickable="true"
- android:contentDescription="@string/play_audio"
- android:drawableTop="?attr/audio"
- android:gravity="center"
- android:paddingBottom="6dp"
- android:paddingTop="6dp"
- android:text="@string/controls_background_title"
- android:textSize="12sp"/>
- </RelativeLayout>
-
- <!--UPLOADER-->
- <LinearLayout
- android:id="@+id/detail_uploader_root_layout"
+ <!-- TITLE -->
+ <FrameLayout
+ android:id="@+id/detail_title_root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingBottom="8dp"
+ android:clickable="true"
android:paddingLeft="12dp"
- android:paddingRight="12dp"
- android:paddingTop="8dp">
-
-
- <de.hdodenhof.circleimageview.CircleImageView
- android:id="@+id/detail_uploader_thumbnail_view"
- android:layout_width="@dimen/video_item_detail_uploader_image_size"
- android:layout_height="@dimen/video_item_detail_uploader_image_size"
- android:contentDescription="@string/detail_uploader_thumbnail_view_description"
- android:src="@drawable/buddy"
- tools:ignore="RtlHardcoded"/>
+ android:paddingRight="12dp">
<TextView
- android:id="@+id/detail_uploader_text_view"
+ android:id="@+id/detail_video_title_view"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="15dp"
+ android:layout_height="match_parent"
+ android:layout_marginRight="20dp"
+ android:ellipsize="end"
+ android:maxLines="1"
+ android:paddingBottom="8dp"
+ android:paddingTop="12dp"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:textSize="@dimen/video_item_detail_uploader_text_size"
- android:textStyle="bold"
+ android:textSize="@dimen/video_item_detail_title_text_size"
tools:ignore="RtlHardcoded"
- tools:text="Uploader"/>
+ tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed a ultricies ex. Integer sit amet sodales risus. Duis non mi et urna pretium bibendum. Nunc eleifend est quis ipsum porttitor egestas. Sed facilisis, nisl quis eleifend pellentesque, orci metus egestas dolor, at accumsan eros metus quis libero."/>
- <!--<Button
- android:id="@+id/detail_uploader_subscribe"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <ImageView
+ android:id="@+id/detail_toggle_description_view"
+ android:layout_width="15dp"
+ android:layout_height="15dp"
android:layout_gravity="center_vertical|right"
- android:layout_marginRight="12dp"
- android:text="@string/rss_button_title"
- android:textSize="12sp"
- android:theme="@style/RedButton"
- android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
- tools:ignore="RtlHardcoded"
- android:visibility="gone"/>-->
- </LinearLayout>
+ android:layout_marginLeft="5dp"
+ android:src="@drawable/arrow_down"
+ tools:ignore="ContentDescription,RtlHardcoded"/>
- <View
- android:layout_width="match_parent"
- android:layout_height="1px"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:background="?attr/separator_color"/>
+ </FrameLayout>
- <!--DESCRIPTIONS-->
- <LinearLayout
- android:id="@+id/detail_description_root_layout"
+ <!-- LOADING INDICATOR-->
+ <ProgressBar
+ android:id="@+id/loading_progress_bar"
+ style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
+ android:layout_below="@id/detail_title_root_layout"
+ android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+ android:indeterminate="true"
+ android:visibility="gone"
+ tools:visibility="visible"/>
+
+ <!--ERROR PANEL-->
+ <include
+ android:id="@+id/error_panel"
+ layout="@layout/error_retry"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/detail_title_root_layout"
+ android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
+ android:visibility="gone"
+ tools:visibility="visible"/>
+
+ <!--HIDING ROOT-->
+ <LinearLayout
+ android:id="@+id/detail_content_root_hiding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/detail_title_root_layout"
android:orientation="vertical"
android:visibility="gone"
tools:visibility="visible">
- <TextView
- android:id="@+id/detail_upload_date_view"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <!--DETAIL-->
+ <RelativeLayout
+ android:id="@+id/detail_root"
+ android:layout_width="match_parent"
+ android:layout_height="55dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="@dimen/video_item_detail_upload_date_text_size"
- android:textStyle="bold"
- tools:text="Published on Oct 2, 2009"/>
+ android:layout_marginTop="6dp"
+ android:baselineAligned="false"
+ android:orientation="horizontal">
- <TextView
- android:id="@+id/detail_description_view"
+ <!-- VIEW & THUMBS -->
+ <TextView
+ android:id="@+id/detail_view_count_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_marginBottom="6dp"
+ android:layout_marginTop="6dp"
+ android:lines="1"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/video_item_detail_views_text_size"
+ tools:ignore="RtlHardcoded"
+ tools:text="2,816,821,505 views"/>
+
+ <ImageView
+ android:id="@+id/detail_thumbs_up_img_view"
+ android:layout_width="@dimen/video_item_detail_like_image_width"
+ android:layout_height="@dimen/video_item_detail_like_image_height"
+ android:layout_below="@id/detail_view_count_view"
+ android:contentDescription="@string/detail_likes_img_view_description"
+ android:src="?attr/thumbs_up"/>
+
+ <TextView
+ android:id="@+id/detail_thumbs_up_count_view"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/video_item_detail_like_image_height"
+ android:layout_below="@id/detail_view_count_view"
+ android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+ android:layout_toRightOf="@id/detail_thumbs_up_img_view"
+ android:gravity="center_vertical"
+ android:lines="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="@dimen/video_item_detail_likes_text_size"
+ tools:ignore="RtlHardcoded"
+ tools:text="12M"/>
+
+ <ImageView
+ android:id="@+id/detail_thumbs_down_img_view"
+ android:layout_width="@dimen/video_item_detail_like_image_width"
+ android:layout_height="@dimen/video_item_detail_like_image_height"
+ android:layout_below="@id/detail_view_count_view"
+ android:layout_marginLeft="12dp"
+ android:layout_toRightOf="@id/detail_thumbs_up_count_view"
+ android:contentDescription="@string/detail_dislikes_img_view_description"
+ android:src="?attr/thumbs_down"
+ tools:ignore="RtlHardcoded"/>
+
+ <TextView
+ android:id="@+id/detail_thumbs_down_count_view"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/video_item_detail_like_image_height"
+ android:layout_below="@id/detail_view_count_view"
+ android:layout_marginLeft="@dimen/video_item_detail_like_margin"
+ android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+ android:gravity="center_vertical"
+ android:lines="1"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="@dimen/video_item_detail_likes_text_size"
+ tools:ignore="RtlHardcoded"
+ tools:text="10K"/>
+
+ <TextView
+ android:id="@+id/detail_thumbs_disabled_view"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/video_item_detail_like_image_height"
+ android:layout_below="@id/detail_view_count_view"
+ android:layout_marginLeft="12dp"
+ android:layout_toRightOf="@id/detail_thumbs_down_img_view"
+ android:gravity="center_vertical"
+ android:text="@string/disabled"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/video_item_detail_likes_text_size"
+ android:textStyle="bold"
+ android:visibility="gone"
+ tools:ignore="RtlHardcoded"
+ tools:visibility="visible"/>
+
+ <!-- CONTROLS -->
+ <TextView
+ android:id="@+id/detail_controls_popup"
+ android:layout_width="80dp"
+ android:layout_height="55dp"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_vertical"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:clickable="true"
+ android:contentDescription="@string/open_in_popup_mode"
+ android:drawableTop="?attr/popup"
+ android:gravity="center"
+ android:paddingBottom="6dp"
+ android:paddingTop="6dp"
+ android:text="@string/controls_popup_title"
+ android:textSize="12sp"/>
+
+ <TextView
+ android:id="@+id/detail_controls_background"
+ android:layout_width="80dp"
+ android:layout_height="55dp"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_vertical"
+ android:layout_toLeftOf="@id/detail_controls_popup"
+ android:background="?attr/selectableItemBackgroundBorderless"
+ android:clickable="true"
+ android:contentDescription="@string/play_audio"
+ android:drawableTop="?attr/audio"
+ android:gravity="center"
+ android:paddingBottom="6dp"
+ android:paddingTop="6dp"
+ android:text="@string/controls_background_title"
+ android:textSize="12sp"/>
+ </RelativeLayout>
+
+ <!--UPLOADER-->
+ <LinearLayout
+ android:id="@+id/detail_uploader_root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:layout_marginTop="3dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textIsSelectable="true"
- android:textSize="@dimen/video_item_detail_description_text_size"
- 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."/>
+ android:background="?attr/selectableItemBackground"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:paddingBottom="8dp"
+ android:paddingLeft="12dp"
+ android:paddingRight="12dp"
+ android:paddingTop="8dp">
+
+
+ <de.hdodenhof.circleimageview.CircleImageView
+ android:id="@+id/detail_uploader_thumbnail_view"
+ android:layout_width="@dimen/video_item_detail_uploader_image_size"
+ android:layout_height="@dimen/video_item_detail_uploader_image_size"
+ android:contentDescription="@string/detail_uploader_thumbnail_view_description"
+ android:src="@drawable/buddy"
+ tools:ignore="RtlHardcoded"/>
+
+ <TextView
+ android:id="@+id/detail_uploader_text_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="15dp"
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textSize="@dimen/video_item_detail_uploader_text_size"
+ android:textStyle="bold"
+ tools:ignore="RtlHardcoded"
+ tools:text="Uploader"/>
+
+ <!--<Button
+ android:id="@+id/detail_uploader_subscribe"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|right"
+ android:layout_marginRight="12dp"
+ android:text="@string/rss_button_title"
+ android:textSize="12sp"
+ android:theme="@style/RedButton"
+ android:drawableLeft="@drawable/ic_rss_feed_white_24dp"
+ tools:ignore="RtlHardcoded"
+ android:visibility="gone"/>-->
+ </LinearLayout>
<View
android:layout_width="match_parent"
@@ -348,50 +311,99 @@
android:layout_marginRight="8dp"
android:background="?attr/separator_color"/>
- </LinearLayout>
-
- <!--NEXT AND RELATED VIDEOS-->
- <LinearLayout
- android:id="@+id/detail_related_streams_root_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal|bottom"
- android:layout_marginTop="14dp"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/detail_next_stream_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="12dp"
- android:text="@string/next_video_title"
- android:textAllCaps="true"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textSize="@dimen/video_item_detail_next_text_size"
- tools:ignore="RtlHardcoded"/>
-
+ <!--DESCRIPTIONS-->
<LinearLayout
- android:id="@+id/detail_related_streams_view"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginTop="2dp"
- android:orientation="vertical"
- tools:minHeight="50dp"/>
-
- <ImageButton
- android:id="@+id/detail_related_streams_expand"
+ android:id="@+id/detail_description_root_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground"
- android:paddingBottom="10dp"
- android:paddingTop="4dp"
- android:src="?attr/expand"
- android:textAlignment="center"
- android:textAllCaps="true"
- tools:ignore="ContentDescription"/>
+ android:layout_marginTop="5dp"
+ android:orientation="vertical"
+ android:visibility="gone"
+ tools:visibility="visible">
+
+ <TextView
+ android:id="@+id/detail_upload_date_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="@dimen/video_item_detail_upload_date_text_size"
+ android:textStyle="bold"
+ tools:text="Published on Oct 2, 2009"/>
+
+ <TextView
+ android:id="@+id/detail_description_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="8dp"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
+ android:layout_marginTop="3dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textIsSelectable="true"
+ android:textSize="@dimen/video_item_detail_description_text_size"
+ 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."/>
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1px"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:background="?attr/separator_color"/>
+
+ </LinearLayout>
+
+ <!--NEXT AND RELATED VIDEOS-->
+ <LinearLayout
+ android:id="@+id/detail_related_streams_root_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal|bottom"
+ android:layout_marginTop="14dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/detail_next_stream_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="12dp"
+ android:text="@string/next_video_title"
+ android:textAllCaps="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textSize="@dimen/video_item_detail_next_text_size"
+ tools:ignore="RtlHardcoded"/>
+
+ <LinearLayout
+ android:id="@+id/detail_related_streams_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginTop="2dp"
+ android:orientation="vertical"
+ tools:minHeight="50dp"/>
+
+ <ImageButton
+ android:id="@+id/detail_related_streams_expand"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?attr/selectableItemBackground"
+ android:paddingBottom="10dp"
+ android:paddingTop="4dp"
+ android:src="?attr/expand"
+ android:textAlignment="center"
+ android:textAllCaps="true"
+ tools:ignore="ContentDescription"/>
+ </LinearLayout>
</LinearLayout>
- </LinearLayout>
- </RelativeLayout>
- </LinearLayout>
- </com.nirhart.parallaxscroll.views.ParallaxScrollView>
-</FrameLayout>
+ </RelativeLayout>
+ </LinearLayout>
+ </com.nirhart.parallaxscroll.views.ParallaxScrollView>
+ </FrameLayout>
+
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="4dp"
+ android:background="?attr/toolbar_shadow_drawable"
+ android:layout_alignParentTop="true"/>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml
index 36ab6454e..096974c03 100644
--- a/app/src/main/res/layout/toolbar_layout.xml
+++ b/app/src/main/res/layout/toolbar_layout.xml
@@ -36,9 +36,4 @@
</android.support.v7.widget.Toolbar>
- <View
- android:layout_width="match_parent"
- android:layout_height="4dp"
- android:background="?attr/toolbar_shadow_drawable"/>
-
</LinearLayout>
\ No newline at end of file