norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

unify seek-bar layout

Browse Source
This commit is contained in:
Adrian Ulrich 2018-12-03 21:17:21 +01:00
parent 9e23dfce15
commit b8d5953cf0
4 changed files with 56 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/res/layout/full_playback.xml
View File

@ -26,38 +26,7 @@ THE SOFTWARE.
android:id="@+id/cover_view" android:id="@+id/cover_view"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" /> android:layout_width="fill_parent" />
<LinearLayout <include layout="@layout/seek_bar" android:id="@+id/controls_top" />
android:id="@+id/controls_top"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_gravity="top"
android:background="?overlay_background_color"
android:orientation="horizontal">
<TextView
android:id="@+id/elapsed"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:paddingLeft="5dip" />
<SeekBar
android:id="@+id/seek_bar"
android:layout_height="wrap_content"
android:layout_width="0px"
android:layout_gravity="center"
android:minHeight="32dip"
android:maxHeight="32dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:paddingLeft="18dip"
android:paddingRight="18dip"
android:layout_weight="1" />
<TextView
android:id="@+id/duration"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:paddingRight="5dip" />
</LinearLayout>
<ch.blinkenlights.android.vanilla.SlidingView <ch.blinkenlights.android.vanilla.SlidingView
android:id="@+id/sliding_view" android:id="@+id/sliding_view"

26
app/src/main/res/layout/full_playback_alt.xml
View File

@ -48,31 +48,7 @@ THE SOFTWARE.
android:gravity="right" /> android:gravity="right" />
<TextView android:id="@+id/replaygain" android:textColor="?overlay_foreground_color"/> <TextView android:id="@+id/replaygain" android:textColor="?overlay_foreground_color"/>
</TableRow> </TableRow>
<include layout="@layout/seek_bar" android:id="@+id/controls_top" />
<LinearLayout android:id="@+id/controls_top">
<TextView
android:id="@+id/elapsed"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="10sp"
android:layout_gravity="center" />
<SeekBar
android:id="@+id/seek_bar"
android:layout_height="wrap_content"
android:layout_width="0px"
android:layout_gravity="center"
android:layout_weight="1"
android:minHeight="32dip"
android:maxHeight="32dip"
android:paddingLeft="18dip"
android:paddingRight="18dip" />
<TextView
android:id="@+id/duration"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:textSize="10sp"
android:layout_gravity="center" />
</LinearLayout>
</TableLayout> </TableLayout>

32
app/src/main/res/layout/library_content.xml
View File

@ -67,37 +67,7 @@ THE SOFTWARE.
<include layout="@layout/bottombar_controls" android:id="@+id/bottombar_controls" /> <include layout="@layout/bottombar_controls" android:id="@+id/bottombar_controls" />
</LinearLayout> </LinearLayout>
<include layout="@layout/seek_bar" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_gravity="top"
android:background="?overlay_background_color"
android:elevation="2dp"
android:orientation="horizontal">
<TextView
android:id="@+id/elapsed"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:paddingLeft="5dip" />
<SeekBar
android:id="@+id/seek_bar"
android:layout_height="wrap_content"
android:layout_width="0px"
android:layout_gravity="center"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:paddingLeft="18dip"
android:paddingRight="18dip"
android:layout_weight="1" />
<TextView
android:id="@+id/duration"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:paddingRight="5dip" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_height="wrap_content" android:layout_height="wrap_content"

53
app/src/main/res/layout/seek_bar.xml Normal file
View File

@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 Adrian Ulrich <adrian@blinkenlights.ch>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_gravity="top"
android:background="?overlay_background_color"
android:elevation="2dp"
android:orientation="horizontal">
<TextView
android:id="@+id/elapsed"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:paddingLeft="5dip" />
<SeekBar
android:id="@+id/seek_bar"
android:layout_height="wrap_content"
android:layout_width="0px"
android:layout_gravity="center"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:paddingLeft="18dip"
android:paddingRight="18dip"
android:layout_weight="1" />
<TextView
android:id="@+id/duration"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:paddingRight="5dip" />
</LinearLayout>