Skip to content

SDK / exoplayer

Go to a project
Commit a837e7a3 by olly Committed by Oliver Woodman
Options

Cleanup layout XMLs to be consistent with others 

PiperOrigin-RevId: 333023580
parent 77249bdf
Inline Side-by-side
Showing with 53 additions and 53 deletions
library/ui/src/main/res/layout/exo_styled_embedded_transport_controls.xml
...@@ -20,9 +20,19 @@ ...@@ -20,9 +20,19 @@
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="visible"> android:visibility="visible">
<ImageButton android:id="@+id/exo_prev" style="@style/ExoStyledControls.Button.Center.Previous" /> <ImageButton android:id="@+id/exo_prev"
<Button android:id="@+id/exo_rew_with_amount" style="@style/ExoStyledControls.Button.Center.RewWithAmount" /> style="@style/ExoStyledControls.Button.Center.Previous"/>
<ImageButton android:id="@+id/exo_play_pause" style="@style/ExoStyledControls.Button.Center.PlayPause" />
<Button android:id="@+id/exo_ffwd_with_amount" style="@style/ExoStyledControls.Button.Center.FfwdWithAmount" /> <Button android:id="@+id/exo_rew_with_amount"
<ImageButton android:id="@+id/exo_next" style="@style/ExoStyledControls.Button.Center.Next" /> style="@style/ExoStyledControls.Button.Center.RewWithAmount"/>
<ImageButton android:id="@+id/exo_play_pause"
style="@style/ExoStyledControls.Button.Center.PlayPause"/>
<Button android:id="@+id/exo_ffwd_with_amount"
style="@style/ExoStyledControls.Button.Center.FfwdWithAmount"/>
<ImageButton android:id="@+id/exo_next"
style="@style/ExoStyledControls.Button.Center.Next"/>
</LinearLayout> </LinearLayout>
library/ui/src/main/res/layout/exo_styled_player_control_view.xml
...@@ -14,38 +14,35 @@ ...@@ -14,38 +14,35 @@
limitations under the License. limitations under the License.
--> -->
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android">
<FrameLayout
android:id="@+id/exo_center_view" <FrameLayout android:id="@+id/exo_center_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<View <View android:id="@+id/exo_center_view_background"
android:id="@+id/exo_center_view_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@color/exo_black_opacity_30" /> android:background="@color/exo_black_opacity_30"/>
<include <include android:id="@+id/exo_embedded_transport_controls"
android:id="@+id/exo_embedded_transport_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
layout="@layout/exo_styled_embedded_transport_controls" /> layout="@layout/exo_styled_embedded_transport_controls"/>
</FrameLayout> </FrameLayout>
<FrameLayout <FrameLayout android:id="@+id/exo_bottom_bar"
android:id="@+id/exo_bottom_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/exo_bottom_bar_height" android:layout_height="@dimen/exo_bottom_bar_height"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@color/exo_bottom_bar_background" android:background="@color/exo_bottom_bar_background"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<LinearLayout <LinearLayout android:id="@+id/exo_time"
android:id="@+id/exo_time"
android:layout_width="@dimen/exo_time_view_width" android:layout_width="@dimen/exo_time_view_width"
android:layout_height="@dimen/exo_bottom_bar_height" android:layout_height="@dimen/exo_bottom_bar_height"
android:paddingStart="@dimen/exo_time_view_padding" android:paddingStart="@dimen/exo_time_view_padding"
...@@ -55,87 +52,79 @@ ...@@ -55,87 +52,79 @@
android:layout_gravity="bottom|start" android:layout_gravity="bottom|start"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<TextView <TextView android:id="@+id/exo_position"
android:id="@+id/exo_position" style="@style/ExoStyledControls.TimeText.Position"/>
style="@style/ExoStyledControls.TimeText.Position" />
<TextView <TextView
android:id="@+id/exo_time_interpunct" style="@style/ExoStyledControls.TimeText.Separator"/>
style="@style/ExoStyledControls.TimeText.Interpunct" />
<TextView android:id="@+id/exo_duration"
style="@style/ExoStyledControls.TimeText.Duration"/>
<TextView
android:id="@+id/exo_duration"
style="@style/ExoStyledControls.TimeText.Duration" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout android:id="@+id/exo_basic_controls"
android:id="@+id/exo_basic_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:orientation="horizontal" android:orientation="horizontal"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<ImageButton <ImageButton android:id="@id/exo_shuffle"
android:id="@id/exo_shuffle"
style="@style/ExoStyledControls.Button.Bottom.Shuffle"/> style="@style/ExoStyledControls.Button.Bottom.Shuffle"/>
<ImageButton <ImageButton android:id="@id/exo_repeat_toggle"
android:id="@id/exo_repeat_toggle"
style="@style/ExoStyledControls.Button.Bottom.RepeatToggle"/> style="@style/ExoStyledControls.Button.Bottom.RepeatToggle"/>
<ImageButton <ImageButton android:id="@id/exo_vr"
android:id="@id/exo_vr"
style="@style/ExoStyledControls.Button.Bottom.VR"/> style="@style/ExoStyledControls.Button.Bottom.VR"/>
<ImageButton <ImageButton android:id="@+id/exo_subtitle"
android:id="@+id/exo_subtitle"
style="@style/ExoStyledControls.Button.Bottom.CC" style="@style/ExoStyledControls.Button.Bottom.CC"
android:alpha="0.5" android:alpha="0.5"
android:scaleType="fitCenter"/> android:scaleType="fitCenter"/>
<ImageButton <ImageButton android:id="@+id/exo_fullscreen"
android:id="@+id/exo_fullscreen"
style="@style/ExoStyledControls.Button.Bottom.FullScreen"/> style="@style/ExoStyledControls.Button.Bottom.FullScreen"/>
<ImageButton <ImageButton android:id="@+id/exo_overflow_show"
android:id="@+id/exo_overflow_show" style="@style/ExoStyledControls.Button.Bottom.OverflowShow"/>
style="@style/ExoStyledControls.Button.Bottom.OverflowShow" />
</LinearLayout> </LinearLayout>
<HorizontalScrollView <HorizontalScrollView android:id="@+id/exo_extra_controls_scroll_view"
android:id="@+id/exo_extra_controls_scroll_view"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:visibility="invisible"> android:visibility="invisible">
<LinearLayout
android:id="@+id/exo_extra_controls" <LinearLayout android:id="@+id/exo_extra_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:orientation="horizontal" android:orientation="horizontal"
android:layoutDirection="ltr"> android:layoutDirection="ltr">
<ImageButton <ImageButton android:id="@+id/exo_settings"
android:id="@+id/exo_settings" style="@style/ExoStyledControls.Button.Bottom.Settings"/>
style="@style/ExoStyledControls.Button.Bottom.Settings" />
<ImageButton android:id="@+id/exo_overflow_hide"
style="@style/ExoStyledControls.Button.Bottom.OverflowHide"/>
<ImageButton
android:id="@+id/exo_overflow_hide"
style="@style/ExoStyledControls.Button.Bottom.OverflowHide" />
</LinearLayout> </LinearLayout>
</HorizontalScrollView> </HorizontalScrollView>
</FrameLayout> </FrameLayout>
<LinearLayout <LinearLayout android:id="@+id/exo_minimal_controls"
android:id="@+id/exo_minimal_controls"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_marginBottom="@dimen/exo_custom_progress_thumb_size" android:layout_marginBottom="@dimen/exo_custom_progress_thumb_size"
android:visibility="invisible"> android:visibility="invisible">
</LinearLayout> </LinearLayout>
<View android:id="@id/exo_progress_placeholder" <View android:id="@id/exo_progress_placeholder"
...@@ -143,4 +132,5 @@ ...@@ -143,4 +132,5 @@
android:layout_height="@dimen/exo_custom_progress_thumb_size" android:layout_height="@dimen/exo_custom_progress_thumb_size"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:layout_marginBottom="@dimen/exo_custom_progress_margin_bottom"/> android:layout_marginBottom="@dimen/exo_custom_progress_margin_bottom"/>
</merge> </merge>
library/ui/src/main/res/values/styles.xml
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<item name="android:text">@string/exo_controls_time_placeholder</item> <item name="android:text">@string/exo_controls_time_placeholder</item>
</style> </style>
<style name="ExoStyledControls.TimeText.Interpunct"> <style name="ExoStyledControls.TimeText.Separator">
<item name="android:textColor">@color/exo_white_opacity_70</item> <item name="android:textColor">@color/exo_white_opacity_70</item>
<item name="android:text">·</item> <item name="android:text">·</item>
</style> </style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment