Merge branch 'dev' into daynight

This commit is contained in:
krlvm 2021-04-03 00:08:26 +03:00 committed by GitHub
commit ef0999b9c3
105 changed files with 1017 additions and 942 deletions

View file

@ -2,6 +2,10 @@
<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_rename_playlist"
android:title="@string/rename_playlist"
app:showAsAction="never" />
<item
android:id="@+id/menu_item_remove_watched"
android:title="@string/remove_watched"

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/action_website"
android:id="@+id/menu_software_website"
android:title="@string/action_open_website" />
<item
android:id="@+id/action_show_license"
android:title="@string/read_full_license"></item>
android:id="@+id/menu_software_show_license"
android:title="@string/read_full_license" />
</menu>