Merged the latest changes
This commit is contained in:
commit
d2aaa6f691
1254 changed files with 39193 additions and 18652 deletions
|
|
@ -1,10 +1,10 @@
|
|||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/okay"
|
||||
android:title="@string/finish"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/okay"
|
||||
android:title="@string/finish"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -11,24 +11,19 @@
|
|||
|
||||
<item android:id="@+id/start_downloads"
|
||||
android:visible="false"
|
||||
android:icon="?attr/play"
|
||||
android:icon="?attr/ic_play_arrow"
|
||||
android:title="@string/start_downloads"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item android:id="@+id/pause_downloads"
|
||||
android:visible="false"
|
||||
android:icon="?attr/pause"
|
||||
android:icon="?attr/ic_pause"
|
||||
android:title="@string/pause_downloads"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item android:id="@+id/clear_list"
|
||||
android:visible="false"
|
||||
android:icon="?attr/ic_delete"
|
||||
android:title="@string/clear_finished_download"
|
||||
android:title="@string/clear_download_history"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item android:id="@+id/action_settings"
|
||||
android:title="@string/settings"
|
||||
app:showAsAction="never" />
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -5,5 +5,5 @@
|
|||
<item android:id="@+id/menu_item_share_error"
|
||||
android:title="@string/share"
|
||||
app:showAsAction="ifRoom"
|
||||
android:icon="?attr/share"/>
|
||||
android:icon="?attr/ic_share"/>
|
||||
</menu>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<item
|
||||
android:id="@+id/action_search"
|
||||
android:icon="?attr/search"
|
||||
android:icon="?attr/ic_search"
|
||||
android:orderInCategory="1"
|
||||
android:title="@string/search"
|
||||
app:showAsAction="always"/>
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_show_downloads"
|
||||
android:orderInCategory="980"
|
||||
android:title="@string/downloads"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_history"
|
||||
android:orderInCategory="981"
|
||||
android:title="@string/action_history"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_settings"
|
||||
android:orderInCategory="990"
|
||||
android:title="@string/settings"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context="org.schabi.newpipe.about.AboutActivity">
|
||||
|
||||
<item android:id="@+id/action_show_downloads"
|
||||
android:orderInCategory="980"
|
||||
android:title="@string/downloads"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item android:id="@+id/action_settings"
|
||||
android:orderInCategory="990"
|
||||
android:title="@string/settings"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
</menu>
|
||||
|
|
@ -4,14 +4,9 @@
|
|||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context=".fragments.list.impl.ChannelFragment">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_openInBrowser"
|
||||
android:title="@string/open_in_browser"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_rss"
|
||||
android:icon="?attr/rss"
|
||||
android:icon="?attr/ic_rss"
|
||||
android:title="@string/rss_button_title"
|
||||
android:visible="false"
|
||||
app:showAsAction="ifRoom"
|
||||
|
|
@ -19,7 +14,19 @@
|
|||
|
||||
<item
|
||||
android:id="@+id/menu_item_share"
|
||||
android:icon="?attr/share"
|
||||
android:icon="?attr/ic_share"
|
||||
android:title="@string/share"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_settings"
|
||||
android:orderInCategory="1"
|
||||
android:title="@string/settings"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_openInBrowser"
|
||||
android:orderInCategory="2"
|
||||
android:title="@string/open_in_browser"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
|
|
|
|||
10
app/src/main/res/menu/menu_feed_fragment.xml
Normal file
10
app/src/main/res/menu/menu_feed_fragment.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_feed_help"
|
||||
android:icon="?attr/ic_help"
|
||||
android:title="@string/help"
|
||||
app:showAsAction="always" />
|
||||
</menu>
|
||||
19
app/src/main/res/menu/menu_feed_group_dialog.xml
Normal file
19
app/src/main/res/menu/menu_feed_group_dialog.xml
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_search"
|
||||
android:icon="?attr/ic_search"
|
||||
android:title="@string/search"
|
||||
app:showAsAction="always"
|
||||
tools:ignore="AlwaysShowAction" />
|
||||
|
||||
<item
|
||||
android:id="@+id/feed_group_toggle_show_only_ungrouped_subscriptions"
|
||||
android:checkable="true"
|
||||
android:checked="false"
|
||||
android:title="@string/feed_group_show_only_ungrouped_subscriptions"
|
||||
app:showAsAction="never" />
|
||||
</menu>
|
||||
9
app/src/main/res/menu/menu_local_playlist.xml
Normal file
9
app/src/main/res/menu/menu_local_playlist.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_remove_watched"
|
||||
android:title="@string/remove_watched"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
|
|
@ -10,18 +10,33 @@
|
|||
android:visible="true"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
|
||||
<item
|
||||
android:id="@+id/action_playback_speed"
|
||||
android:title="1x"
|
||||
android:tooltipText="@string/playback_speed_control"
|
||||
android:visible="true"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_mute"
|
||||
android:icon="?attr/ic_volume_off"
|
||||
android:title="@string/mute"
|
||||
android:visible="true"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item android:id="@+id/action_settings"
|
||||
android:orderInCategory="990"
|
||||
android:orderInCategory="1"
|
||||
android:title="@string/settings"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item android:id="@+id/action_system_audio"
|
||||
android:orderInCategory="996"
|
||||
android:orderInCategory="2"
|
||||
android:title="@string/play_queue_audio_settings"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item android:id="@+id/action_switch_main"
|
||||
android:orderInCategory="999"
|
||||
android:orderInCategory="3"
|
||||
android:title="@string/switch_to_main"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -3,14 +3,9 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_openInBrowser"
|
||||
android:title="@string/open_in_browser"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_share"
|
||||
android:icon="?attr/share"
|
||||
android:icon="?attr/ic_share"
|
||||
android:title="@string/share"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
|
|
@ -21,4 +16,16 @@
|
|||
android:visible="true"
|
||||
app:showAsAction="ifRoom"
|
||||
tools:visible="true"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_settings"
|
||||
android:orderInCategory="1"
|
||||
android:title="@string/settings"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_openInBrowser"
|
||||
android:orderInCategory="2"
|
||||
android:title="@string/open_in_browser"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
10
app/src/main/res/menu/menu_recaptcha.xml
Normal file
10
app/src/main/res/menu/menu_recaptcha.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_done"
|
||||
android:title="@string/recaptcha_done_button"
|
||||
android:icon="?attr/ic_done"
|
||||
app:showAsAction="always"/>
|
||||
</menu>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
<item
|
||||
android:id="@+id/filter"
|
||||
android:icon="?attr/filter"
|
||||
android:icon="?attr/ic_filter_list"
|
||||
android:title="@string/filter"
|
||||
app:showAsAction="always">
|
||||
<menu>
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<item
|
||||
android:id="@+id/toggleOrientation"
|
||||
android:icon="@drawable/ic_screen_rotation_white"
|
||||
android:icon="@drawable/ic_screen_rotation_white_24dp"
|
||||
android:title="@string/toggle_orientation"
|
||||
app:showAsAction="ifRoom|withText" />
|
||||
<item
|
||||
android:id="@+id/switchPopup"
|
||||
android:icon="@drawable/ic_fullscreen_exit_white"
|
||||
android:icon="@drawable/ic_fullscreen_exit_white_24dp"
|
||||
android:title="@string/switch_to_popup"
|
||||
app:showAsAction="ifRoom|withText" />
|
||||
<item
|
||||
android:id="@+id/switchBackground"
|
||||
android:icon="?audio"
|
||||
android:icon="?attr/ic_headset"
|
||||
android:title="@string/switch_to_background"
|
||||
app:showAsAction="ifRoom|withText" />
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -4,18 +4,25 @@
|
|||
|
||||
<item
|
||||
android:id="@+id/action_play_with_kodi"
|
||||
android:icon="?attr/cast"
|
||||
android:icon="?attr/ic_cast"
|
||||
android:title="@string/play_with_kodi_title"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_share"
|
||||
android:icon="?attr/share"
|
||||
android:icon="?attr/ic_share"
|
||||
android:title="@string/share"
|
||||
app:showAsAction="ifRoom"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_settings"
|
||||
android:orderInCategory="1"
|
||||
android:title="@string/settings"
|
||||
app:showAsAction="never"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_item_openInBrowser"
|
||||
android:orderInCategory="2"
|
||||
android:title="@string/open_in_browser"
|
||||
app:showAsAction="never"/>
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item android:id="@+id/menu_item_screen_rotation"
|
||||
android:title="@string/screen_rotation"
|
||||
app:showAsAction="always"
|
||||
android:icon="@drawable/ic_screen_rotation_white"/>
|
||||
</menu>
|
||||
Loading…
Add table
Add a link
Reference in a new issue