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

merge RouterActivity and RouterVideoActivity

Browse source 
change share title

fixed compatiblity issue

rename info_screen to show_info
This commit is contained in:
Christian Schabesberger 2018-02-12 19:44:35 +01:00
parent ba0be665ae
commit cbfe91f36f
24 changed files with 477 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@
<!--TODO: preffix these with "ic_"-->
<attr name="thumbs_up" format="reference"/>
<attr name="thumbs_down" format="reference"/>
<attr name="info" format="reference"/>
<attr name="audio" format="reference"/>
<attr name="download" format="reference"/>
<attr name="share" format="reference"/>

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

@ -155,6 +155,7 @@
<string name="preferred_player_default" translatable="false">@string/always_ask_player_key</string>
<string name="preferred_player_last_selected_key" translatable="false">preferred_player_last_selected</string>
<string name="info_screen_key" translatable="false">info_screen</string>
<string name="video_player_key" translatable="false">video_player</string>
<string name="background_player_key" translatable="false">background_player</string>
<string name="popup_player_key" translatable="false">popup_player</string>

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

@ -30,6 +30,7 @@
<string name="channel_unsubscribed">Channel unsubscribed</string>
<string name="subscription_change_failed">Unable to change subscription</string>
<string name="subscription_update_failed">Unable to update subscription</string>
<string name="show_info">Show info</string>
<string name="tab_main">Main</string>
<string name="tab_subscriptions">Subscriptions</string>
@ -368,7 +369,7 @@
<!-- Preferred player -->
<string name="preferred_player_share_menu_title" translatable="false">@string/preferred_player_settings_title</string>
<string name="preferred_player_share_menu_title" translatable="false">NewPipe</string>
<string name="preferred_player_share_menu_dialog_title">Open with preferred player</string>
<string name="preferred_player_settings_title">Preferred player</string>

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

@ -18,6 +18,7 @@
<item name="thumbs_up">@drawable/ic_thumb_up_black_24dp</item>
<item name="thumbs_down">@drawable/ic_thumb_down_black_24dp</item>
<item name="info">@drawable/ic_info_outline_black_24dp</item>
<item name="audio">@drawable/ic_headset_black_24dp</item>
<item name="clear_history">@drawable/ic_delete_sweep_white_24dp</item>
<item name="download">@drawable/ic_file_download_black_24dp</item>
@ -69,6 +70,7 @@
<item name="thumbs_up">@drawable/ic_thumb_up_white_24dp</item>
<item name="thumbs_down">@drawable/ic_thumb_down_white_24dp</item>
<item name="audio">@drawable/ic_headset_white_24dp</item>
<item name="info">@drawable/ic_info_outline_white_24dp</item>
<item name="clear_history">@drawable/ic_delete_sweep_black_24dp</item>
<item name="download">@drawable/ic_file_download_white_24dp</item>
<item name="share">@drawable/ic_share_white_24dp</item>