Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into pr3178

Browse source
This commit is contained in:
Stypox 2020-09-03 21:56:48 +02:00
commit 97ff9e9c5b
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
145 changed files with 1182 additions and 1103 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/res/layout/local_playlist_header.xml
View file

@ -1,34 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dp"
android:background="?attr/contrast_background_color">
<TextView
android:id="@+id/playlist_title_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_marginRight="6dp"
android:padding="6dp"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:paddingHorizontal="@dimen/video_item_search_padding"
android:paddingTop="@dimen/video_item_search_padding"
android:paddingBottom="6dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="@dimen/playlist_detail_title_text_size"
tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur..."/>
tools:text="Mix musics #23 title Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tristique vitae sem vitae blanditLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsumLorem ipsum"/>
<TextView
android:id="@+id/playlist_stream_count"
@ -36,8 +28,7 @@
android:layout_height="wrap_content"
android:layout_below="@id/playlist_title_view"
android:layout_alignParentLeft="true"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingHorizontal="@dimen/video_item_search_padding"
android:ellipsize="end"
android:gravity="right|center_vertical"
android:maxLines="1"

18
app/src/main/res/layout/playlist_header.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -12,9 +11,8 @@
android:id="@+id/playlist_title_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="6dp"
android:paddingHorizontal="@dimen/video_item_search_padding"
android:paddingTop="@dimen/video_item_search_padding"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="?android:attr/textAppearanceLarge"
@ -25,19 +23,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/playlist_title_view"
android:paddingHorizontal="@dimen/video_item_search_padding"
android:paddingTop="6dp"
android:id="@+id/playlist_meta">
<RelativeLayout
android:id="@+id/uploader_layout"
android:layout_width="wrap_content"
android:layout_height="@dimen/playlist_detail_uploader_layout_height"
android:layout_marginLeft="4dp"
android:layout_marginRight="6dp"
android:layout_marginTop="6dp"
android:layout_toLeftOf="@+id/playlist_stream_count"
android:layout_toStartOf="@+id/playlist_stream_count"
android:background="?attr/selectableItemBackground"
android:gravity="left|center_vertical"
android:padding="2dp"
android:visibility="gone"
tools:ignore="RtlHardcoded"
tools:visibility="visible">
@ -46,8 +42,8 @@
android:id="@+id/uploader_avatar_view"
android:layout_width="@dimen/playlist_detail_uploader_image_size"
android:layout_height="@dimen/playlist_detail_uploader_image_size"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_margin="1dp"
android:src="@drawable/buddy"
app:civ_border_color="#ffffff"
app:civ_border_width="1dp"/>
@ -56,7 +52,7 @@
android:id="@+id/uploader_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="4dp"
android:paddingHorizontal="6dp"
android:layout_toRightOf="@+id/uploader_avatar_view"
android:ellipsize="end"
android:gravity="left|center_vertical"
@ -73,7 +69,7 @@
android:layout_alignBottom="@+id/uploader_layout"
android:layout_alignTop="@+id/uploader_layout"
android:layout_alignParentRight="true"
android:layout_marginRight="6dp"
android:layout_marginLeft="6dp"
android:ellipsize="end"
android:gravity="right|center_vertical"
android:maxLines="1"

2
app/src/main/res/values/settings_keys.xml
View file

@ -1191,7 +1191,7 @@
<item>Italiano</item>
<item>日本語</item>
<item>ꦧꦱꦗꦮ</item>
<item>Tamaziɣt Taqbaylit</item>
<item>Taqbaylit</item>
<item>한국어</item>
<item>کوردی</item>
<item>Lietuvių kalba</item>

4
app/src/main/res/values/strings.xml
View file

@ -89,7 +89,7 @@
<string name="light_theme_title">Light</string>
<string name="dark_theme_title">Dark</string>
<string name="black_theme_title">Black</string>
<string name="popup_remember_size_pos_title">Remember popup size and position</string>
<string name="popup_remember_size_pos_title">Remember popup properties</string>
<string name="popup_remember_size_pos_summary">Remember last size and position of popup</string>
<string name="use_inexact_seek_title">Use fast inexact seek</string>
<string name="use_inexact_seek_summary">Inexact seek allows the player to seek to positions faster with reduced precision. Seeking for 5, 15 or 25 seconds doesn\'t work with this.</string>
@ -688,4 +688,4 @@
<string name="channel_created_by">Created by %s</string>
<string name="video_detail_by">By %s</string>
<string name="playlist_page_summary">Playlist page</string>
</resources>
</resources>