2017-03-09 08:42:40 +01:00
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<FrameLayout
|
|
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:background="@android:color/black"
|
2017-05-01 07:23:50 +02:00
|
|
|
android:gravity="center"
|
2017-07-10 03:38:47 +02:00
|
|
|
tools:layout_height="84dp"
|
|
|
|
tools:layout_width="@dimen/popup_minimum_width">
|
2017-03-09 08:42:40 +01:00
|
|
|
|
2017-03-27 06:08:16 +02:00
|
|
|
<com.google.android.exoplayer2.ui.AspectRatioFrameLayout
|
|
|
|
android:id="@+id/aspectRatioLayout"
|
2017-03-09 08:42:40 +01:00
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:layout_gravity="center">
|
2017-03-09 08:42:40 +01:00
|
|
|
|
2017-03-27 06:08:16 +02:00
|
|
|
<SurfaceView
|
|
|
|
android:id="@+id/surfaceView"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:layout_gravity="center"/>
|
|
|
|
|
|
|
|
<View
|
|
|
|
android:id="@+id/surfaceForeground"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:background="@android:color/black"/>
|
|
|
|
|
2018-02-03 23:39:03 +01:00
|
|
|
<com.google.android.exoplayer2.ui.SubtitleView
|
|
|
|
android:id="@+id/subtitleView"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"/>
|
2017-03-27 06:08:16 +02:00
|
|
|
</com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
|
2017-03-09 08:42:40 +01:00
|
|
|
|
|
|
|
|
|
|
|
<ImageView
|
|
|
|
android:id="@+id/endScreen"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:background="@color/black"
|
|
|
|
android:visibility="gone"
|
|
|
|
tools:background="@android:color/white"
|
2017-03-27 06:08:16 +02:00
|
|
|
tools:ignore="ContentDescription"
|
|
|
|
tools:visibility="visible"/>
|
|
|
|
|
|
|
|
<RelativeLayout
|
|
|
|
android:id="@+id/playbackControlRoot"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:background="#32000000"
|
|
|
|
android:visibility="gone"
|
|
|
|
tools:visibility="visible">
|
|
|
|
|
2018-05-02 22:08:14 +02:00
|
|
|
<ImageView
|
|
|
|
android:id="@+id/videoPlayPause"
|
|
|
|
android:layout_width="55dp"
|
|
|
|
android:layout_height="55dp"
|
|
|
|
android:layout_centerHorizontal="false"
|
|
|
|
android:layout_centerInParent="true"
|
|
|
|
android:visibility="gone"
|
|
|
|
tools:ignore="ContentDescription"
|
|
|
|
tools:visibility="visible" />
|
|
|
|
|
2017-03-27 06:08:16 +02:00
|
|
|
<RelativeLayout
|
|
|
|
android:id="@+id/topControls"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentTop="true"
|
|
|
|
android:background="@drawable/player_top_controls_bg"
|
|
|
|
android:paddingBottom="20dp"
|
2017-07-10 03:38:47 +02:00
|
|
|
android:paddingLeft="2dp"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:paddingRight="6dp"
|
2017-07-10 03:38:47 +02:00
|
|
|
android:paddingTop="4dp"
|
|
|
|
tools:ignore="RtlHardcoded">
|
2017-03-27 06:08:16 +02:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/qualityTextView"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="30dp"
|
|
|
|
android:layout_alignParentLeft="true"
|
|
|
|
android:gravity="center"
|
2017-07-10 03:38:47 +02:00
|
|
|
android:padding="5dp"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:textColor="@android:color/white"
|
|
|
|
android:textStyle="bold"
|
2018-02-07 22:11:19 +01:00
|
|
|
android:background="?attr/selectableItemBackground"
|
2017-07-10 03:38:47 +02:00
|
|
|
tools:ignore="RtlHardcoded,RtlSymmetry"
|
|
|
|
tools:text="1080p60"/>
|
2017-03-27 06:08:16 +02:00
|
|
|
|
2017-06-26 04:41:52 +02:00
|
|
|
<TextView
|
|
|
|
android:id="@+id/playbackSpeed"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="30dp"
|
2017-07-10 03:38:47 +02:00
|
|
|
android:layout_toRightOf="@+id/qualityTextView"
|
2017-06-26 04:41:52 +02:00
|
|
|
android:gravity="center"
|
2018-02-07 22:11:19 +01:00
|
|
|
android:padding="5dp"
|
2017-06-26 04:41:52 +02:00
|
|
|
android:textColor="@android:color/white"
|
2017-07-10 03:38:47 +02:00
|
|
|
android:textStyle="bold"
|
2018-02-07 22:11:19 +01:00
|
|
|
android:background="?attr/selectableItemBackground"
|
2017-07-10 03:38:47 +02:00
|
|
|
tools:ignore="RelativeOverlap,RtlHardcoded,RtlSymmetry"
|
|
|
|
tools:text="1.75x"/>
|
2017-06-26 04:41:52 +02:00
|
|
|
|
2018-02-07 22:11:19 +01:00
|
|
|
<RelativeLayout
|
|
|
|
android:id="@+id/extraOptionsView"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="30dp"
|
|
|
|
android:layout_toRightOf="@+id/playbackSpeed"
|
|
|
|
android:layout_toLeftOf="@id/fullScreenButton"
|
|
|
|
android:visibility="gone">
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/resizeTextView"
|
2018-05-11 02:48:05 +02:00
|
|
|
android:layout_width="wrap_content"
|
2018-02-07 22:11:19 +01:00
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:layout_alignParentLeft="true"
|
2018-04-21 21:11:52 +02:00
|
|
|
android:background="?attr/selectableItemBackground"
|
2018-02-07 22:11:19 +01:00
|
|
|
android:gravity="center"
|
|
|
|
android:minWidth="50dp"
|
2018-04-21 21:11:52 +02:00
|
|
|
android:padding="5dp"
|
2018-02-07 22:11:19 +01:00
|
|
|
android:textColor="@android:color/white"
|
|
|
|
android:textStyle="bold"
|
|
|
|
tools:ignore="HardcodedText,RtlHardcoded"
|
2018-04-21 21:11:52 +02:00
|
|
|
tools:text="FIT" />
|
2018-02-07 22:11:19 +01:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/captionTextView"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:padding="5dp"
|
|
|
|
android:layout_toRightOf="@id/resizeTextView"
|
|
|
|
android:gravity="center|left"
|
|
|
|
android:minWidth="40dp"
|
|
|
|
android:textColor="@android:color/white"
|
|
|
|
android:textStyle="bold"
|
|
|
|
android:background="?attr/selectableItemBackground"
|
|
|
|
tools:ignore="RelativeOverlap,RtlHardcoded,RtlSymmetry"
|
|
|
|
tools:text="English" />
|
|
|
|
</RelativeLayout>
|
|
|
|
|
2017-03-27 06:08:16 +02:00
|
|
|
<ImageButton
|
|
|
|
android:id="@+id/fullScreenButton"
|
|
|
|
android:layout_width="30dp"
|
|
|
|
android:layout_height="30dp"
|
|
|
|
android:layout_alignParentRight="true"
|
2018-04-21 21:11:52 +02:00
|
|
|
android:background="?attr/selectableItemBackground"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:clickable="true"
|
2017-12-23 17:34:47 +01:00
|
|
|
android:focusable="true"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:scaleType="fitCenter"
|
|
|
|
android:src="@drawable/ic_fullscreen_white"
|
2018-04-21 21:11:52 +02:00
|
|
|
tools:ignore="ContentDescription,RtlHardcoded" />
|
|
|
|
|
2017-03-27 06:08:16 +02:00
|
|
|
</RelativeLayout>
|
|
|
|
|
|
|
|
<!--Shadow Bottom Control-->
|
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentBottom="true"
|
|
|
|
android:background="@drawable/player_controls_bg"
|
|
|
|
android:orientation="horizontal"
|
|
|
|
android:paddingTop="50dp"/>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/bottomControls"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentBottom="true"
|
|
|
|
android:gravity="center_vertical"
|
|
|
|
android:orientation="horizontal"
|
|
|
|
android:paddingBottom="2dp"
|
|
|
|
android:paddingLeft="8dp"
|
|
|
|
android:paddingRight="8dp">
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/playbackCurrentTime"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:gravity="center_vertical"
|
|
|
|
android:text="-:--:--"
|
|
|
|
android:textColor="@android:color/white"
|
|
|
|
tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry"
|
|
|
|
tools:text="1:06:29"/>
|
|
|
|
|
2019-10-04 14:59:08 +02:00
|
|
|
<androidx.appcompat.widget.AppCompatSeekBar
|
2017-03-27 06:08:16 +02:00
|
|
|
android:id="@+id/playbackSeekBar"
|
|
|
|
style="@style/Widget.AppCompat.SeekBar"
|
|
|
|
android:layout_width="0dp"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center_vertical"
|
|
|
|
android:layout_weight="1"
|
|
|
|
tools:progress="25"
|
|
|
|
tools:secondaryProgress="50"/>
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/playbackEndTime"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:gravity="center_vertical"
|
|
|
|
android:text="-:--:--"
|
|
|
|
android:textColor="@android:color/white"
|
|
|
|
tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry"
|
|
|
|
tools:text="1:23:49"/>
|
2018-02-27 04:57:59 +01:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/playbackLiveSync"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2018-03-14 04:25:22 +01:00
|
|
|
android:paddingLeft="4dp"
|
|
|
|
android:paddingRight="4dp"
|
2018-02-27 04:57:59 +01:00
|
|
|
android:gravity="center_vertical"
|
Multiple localization fixes
With the extractor PR, fixes title & description shown in the wrong language.
Fixed views / spectators counts possibly in the wrong language
Fixed live spectators not showing full count on detail page
Fixed LIVE shown on players, it shows translated instead
Fixed Videos string in search / three dots not available in Weblate
(because it was videos, but there already was a plural string named videos, in Weblate)
Subscriber count is always giving the short count.
We can't get exact number since this YouTube update: https://support.google.com/youtube/thread/6543166
But only short count (B, M, k), so showing full number, eg for 1.9M: 1,900,000, is wrong because the number could be 1,923,490 or 1,897,789…
Added a « sytem default » option to content language and country language selector.
It's the one selected by default (not en-GB anymore then), and correspond to the
language of the system / country of the system
By system I mean phone, tablet, TV…
Fixed russian showing - before time ago (eg 19hrs ago)
This is a workaround fix, I opened an issue on prettytime library repo.
Fixed russian plurals:
other was used instead of many for videos and subscribers
Fixed seek_duration english only
2020-02-14 18:19:35 +01:00
|
|
|
android:text="@string/duration_live"
|
2018-03-14 04:25:22 +01:00
|
|
|
android:textAllCaps="true"
|
2018-02-27 04:57:59 +01:00
|
|
|
android:textColor="@android:color/white"
|
|
|
|
android:visibility="gone"
|
|
|
|
android:background="?attr/selectableItemBackground"
|
|
|
|
tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
|
2017-03-27 06:08:16 +02:00
|
|
|
</LinearLayout>
|
|
|
|
</RelativeLayout>
|
2017-03-09 08:42:40 +01:00
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:gravity="center"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:orientation="horizontal"
|
2017-07-10 03:38:47 +02:00
|
|
|
android:weightSum="5.5">
|
2017-03-27 06:08:16 +02:00
|
|
|
<!--tools:visibility="gone">-->
|
2017-03-09 08:42:40 +01:00
|
|
|
|
|
|
|
<ImageView
|
|
|
|
android:id="@+id/controlAnimationView"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:layout_width="0dp"
|
|
|
|
android:layout_height="match_parent"
|
2017-03-09 08:42:40 +01:00
|
|
|
android:layout_weight="1"
|
|
|
|
android:src="@drawable/ic_action_av_fast_rewind"
|
|
|
|
android:visibility="gone"
|
2017-03-27 06:08:16 +02:00
|
|
|
tools:ignore="ContentDescription"
|
|
|
|
tools:visibility="visible"/>
|
2017-03-09 08:42:40 +01:00
|
|
|
</LinearLayout>
|
|
|
|
|
2017-03-27 06:08:16 +02:00
|
|
|
<TextView
|
|
|
|
android:id="@+id/currentDisplaySeek"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center"
|
|
|
|
android:background="#64000000"
|
2017-03-09 08:42:40 +01:00
|
|
|
android:paddingBottom="5dp"
|
2017-03-27 06:08:16 +02:00
|
|
|
android:paddingLeft="20dp"
|
|
|
|
android:paddingRight="20dp"
|
|
|
|
android:paddingTop="5dp"
|
|
|
|
android:textColor="@android:color/white"
|
|
|
|
android:textSize="18sp"
|
|
|
|
android:textStyle="bold"
|
2017-03-09 08:42:40 +01:00
|
|
|
android:visibility="gone"
|
2017-03-27 06:08:16 +02:00
|
|
|
tools:ignore="RtlHardcoded"
|
|
|
|
tools:text="1:06:29"
|
|
|
|
tools:visibility="visible"/>
|
2017-03-09 08:42:40 +01:00
|
|
|
|
|
|
|
<RelativeLayout
|
2017-04-26 21:24:33 +02:00
|
|
|
android:id="@+id/loading_panel"
|
2017-03-09 08:42:40 +01:00
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:layout_gravity="center"
|
|
|
|
android:background="@color/black"
|
|
|
|
android:gravity="center"
|
|
|
|
android:padding="20dp"
|
|
|
|
tools:visibility="gone">
|
|
|
|
|
|
|
|
<ProgressBar
|
2017-03-27 06:08:16 +02:00
|
|
|
android:id="@+id/progressBarLoadingPanel"
|
2017-03-09 08:42:40 +01:00
|
|
|
style="?android:attr/progressBarStyleLarge"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:indeterminate="true"/>
|
|
|
|
</RelativeLayout>
|
2017-05-01 07:23:50 +02:00
|
|
|
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/resizing_indicator"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="left|top"
|
|
|
|
android:background="#6e000000"
|
|
|
|
android:gravity="center"
|
|
|
|
android:padding="5dp"
|
|
|
|
android:text="@string/popup_resizing_indicator_title"
|
|
|
|
android:textColor="@android:color/white"
|
|
|
|
android:textSize="18sp"
|
|
|
|
android:textStyle="bold"
|
|
|
|
android:visibility="gone"
|
|
|
|
tools:ignore="RtlHardcoded"
|
2017-07-10 03:38:47 +02:00
|
|
|
tools:visibility="gone"/>
|
2018-08-22 04:04:46 +02:00
|
|
|
|
|
|
|
<View
|
|
|
|
android:id="@+id/closingOverlay"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:background="#AAFF0000"
|
|
|
|
android:visibility="gone"/>
|
2017-03-09 08:42:40 +01:00
|
|
|
</FrameLayout>
|