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

Merge branch 'dev' into dev

Browse source
This commit is contained in:
Peter Hindes 2019-12-10 09:59:12 -07:00 • committed by GitHub
commit d8e6a5cb33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 872 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,6 +29,8 @@
<attr name="bug" format="reference"/>
<attr name="settings" format="reference"/>
<attr name="ic_hot" format="reference"/>
<attr name="ic_kiosk_local" format="reference"/>
<attr name="ic_kiosk_recent" format="reference"/>
<attr name="ic_channel" format="reference"/>
<attr name="ic_bookmark" format="reference"/>
<attr name="ic_playlist_add" format="reference"/>

11
app/src/main/res/values/colors_services.xml
View file

@ -22,6 +22,17 @@
<color name="dark_soundcloud_accent_color">#FFFFFF</color>
<color name="dark_soundcloud_statusbar_color">#ff9100</color>
<!-- PeerTube -->
<color name="light_peertube_primary_color">#ff6f00</color>
<color name="light_peertube_dark_color">#c43e00</color>
<color name="light_peertube_accent_color">#000000</color>
<color name="light_peertube_statusbar_color">#ff833a</color>
<color name="dark_peertube_primary_color">#ff6f00</color>
<color name="dark_peertube_dark_color">#c43e00</color>
<color name="dark_peertube_accent_color">#FFFFFF</color>
<color name="dark_peertube_statusbar_color">#ff833a</color>
<!-- Media.CCC -->
<color name="light_media_ccc_primary_color">#9e9e9e</color>
<color name="light_media_ccc_dark_color">#616161</color>

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

@ -145,6 +145,9 @@
<string name="default_language_value">en</string>
<string name="default_country_value">GB</string>
<string name="content_language_key" translatable="false">content_language</string>
<string name="peertube_instance_setup_key" translatable="false">peertube_instance_setup</string>
<string name="peertube_selected_instance_key" translatable="false">peertube_selected_instance</string>
<string name="peertube_instance_list_key" translatable="false">peertube_instance_list</string>
<string name="content_country_key" translatable="false">content_country</string>
<string name="show_age_restricted_content" translatable="false">show_age_restricted_content</string>
<string name="use_tor_key" translatable="false">use_tor</string>

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

@ -109,6 +109,14 @@
<string name="default_content_country_title">Default content country</string>
<string name="service_title">Service</string>
<string name="content_language_title">Default content language</string>
<string name="peertube_instance_url_title">PeerTube instances</string>
<string name="peertube_instance_url_summary">Set your favorite peertube instances</string>
<string name="peertube_instance_url_help">Find the instances that best suit you on https://joinpeertube.org/instances#instances-list</string>
<string name="peertube_instance_add_title">Add instance</string>
<string name="peertube_instance_add_help">Enter instance url</string>
<string name="peertube_instance_add_fail">Failed to validate instance</string>
<string name="peertube_instance_add_https_only">Only https urls are supported</string>
<string name="peertube_instance_add_exists">Instance already exists</string>
<string name="settings_category_player_title">Player</string>
<string name="settings_category_player_behavior_title">Behavior</string>
<string name="settings_category_video_audio_title">Video &amp; audio</string>
@ -400,6 +408,9 @@
<string name="trending">Trending</string>
<string name="top_50">Top 50</string>
<string name="new_and_hot">New &amp; hot</string>
<string name="local">Local</string>
<string name="recently_added">Recently added</string>
<string name="most_liked">Most liked</string>
<string name="conferences">Conferences</string>
<string name="service_kiosk_string" translatable="false">%1$s/%2$s</string>
<!-- Play Queue -->
@ -577,4 +588,6 @@
<string name="downloads_storage_ask_summary_kitkat">You will be asked where to save each download.\nChoose SAF if you want to download to an external SD card</string>
<string name="downloads_storage_use_saf_title">Use SAF</string>
<string name="downloads_storage_use_saf_summary">The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible</string>
<string name="choose_instance_prompt">Choose an instance</string>
</resources>

8
app/src/main/res/values/styles.xml
View file

@ -44,6 +44,8 @@
<item name="pause">@drawable/ic_pause_black_24dp</item>
<item name="settings">@drawable/ic_settings_black_24dp</item>
<item name="ic_hot">@drawable/ic_whatshot_black_24dp</item>
<item name="ic_kiosk_local">@drawable/ic_kiosk_local_black_24dp</item>
<item name="ic_kiosk_recent">@drawable/ic_kiosk_recent_black_24dp</item>
<item name="ic_channel">@drawable/ic_channel_black_24dp</item>
<item name="ic_bookmark">@drawable/ic_bookmark_black_24dp</item>
<item name="ic_playlist_add">@drawable/ic_playlist_add_black_24dp</item>
@ -108,6 +110,8 @@
<item name="play">@drawable/ic_play_arrow_white_24dp</item>
<item name="settings">@drawable/ic_settings_white_24dp</item>
<item name="ic_hot">@drawable/ic_whatshot_white_24dp</item>
<item name="ic_kiosk_local">@drawable/ic_kiosk_local_white_24dp</item>
<item name="ic_kiosk_recent">@drawable/ic_kiosk_recent_white_24dp</item>
<item name="ic_channel">@drawable/ic_channel_white_24dp</item>
<item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item>
<item name="ic_playlist_add">@drawable/ic_playlist_add_white_24dp</item>
@ -233,4 +237,8 @@
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowAnimationStyle">@null</item>
</style>
<style name="NavViewTextStyle">
<item name="android:ellipsize">end</item>
</style>
</resources>

19
app/src/main/res/values/styles_services.xml
View file

@ -32,6 +32,25 @@
<item name="progress_horizontal_drawable">@drawable/progress_soundcloud_horizontal_dark</item>
</style>
<!-- PeerTube -->
<style name="LightTheme.PeerTube" parent="LightTheme.Switchable">
<item name="colorPrimary">@color/light_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/light_peertube_dark_color</item>
<item name="colorAccent">@color/light_peertube_accent_color</item>
</style>
<style name="DarkTheme.PeerTube" parent="DarkTheme.Switchable">
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>
<style name="BlackTheme.PeerTube" parent="BlackTheme.Switchable">
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
<item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
<item name="colorAccent">@color/dark_peertube_accent_color</item>
</style>
<!-- Media.ccc -->
<style name="LightTheme.MediaCCC" parent="LightTheme.Switchable">
<item name="colorPrimary">@color/light_media_ccc_primary_color</item>