aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/menu/abstract_top_menu.xml6
-rw-r--r--res/menu/empty.xml6
-rw-r--r--res/menu/select_album.xml6
-rw-r--r--res/menu/select_album_list.xml9
-rw-r--r--res/menu/select_artist.xml6
-rw-r--r--res/menu/select_podcast_episode.xml6
-rw-r--r--res/menu/select_podcast_episode_offline.xml6
-rw-r--r--res/menu/select_podcasts.xml6
-rw-r--r--res/menu/select_song.xml6
-rw-r--r--res/menu/select_song_offline.xml6
-rw-r--r--src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java2
-rw-r--r--src/github/daneren2005/dsub/fragments/SubsonicFragment.java3
12 files changed, 2 insertions, 66 deletions
diff --git a/res/menu/abstract_top_menu.xml b/res/menu/abstract_top_menu.xml
index 46419d0f..67d18390 100644
--- a/res/menu/abstract_top_menu.xml
+++ b/res/menu/abstract_top_menu.xml
@@ -2,12 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
android:id="@+id/menu_search"
android:icon="?attr/search"
android:title="@string/menu.search"
diff --git a/res/menu/empty.xml b/res/menu/empty.xml
index 9bb43bf7..cf7b82de 100644
--- a/res/menu/empty.xml
+++ b/res/menu/empty.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:compat="http://schemas.android.com/apk/res-auto">
- <item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
+
</menu>
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml
index 8dc004f1..4b79d251 100644
--- a/res/menu/select_album.xml
+++ b/res/menu/select_album.xml
@@ -8,12 +8,6 @@
compat:showAsAction="always|withText"/>
<item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
android:id="@+id/menu_shuffle"
android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
diff --git a/res/menu/select_album_list.xml b/res/menu/select_album_list.xml
deleted file mode 100644
index 60b636e3..00000000
--- a/res/menu/select_album_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:compat="http://schemas.android.com/apk/res-auto">
- <item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-</menu>
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index d1e1f4e3..127736d6 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -2,12 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
android:id="@+id/menu_shuffle"
android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
diff --git a/res/menu/select_podcast_episode.xml b/res/menu/select_podcast_episode.xml
index 8a86b49b..dbb369e9 100644
--- a/res/menu/select_podcast_episode.xml
+++ b/res/menu/select_podcast_episode.xml
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:compat="http://schemas.android.com/apk/res-auto">
- <item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
<item
android:id="@+id/menu_download_all"
android:title="@string/select_podcasts.server_download"/>
diff --git a/res/menu/select_podcast_episode_offline.xml b/res/menu/select_podcast_episode_offline.xml
index 7080768a..3665d317 100644
--- a/res/menu/select_podcast_episode_offline.xml
+++ b/res/menu/select_podcast_episode_offline.xml
@@ -2,12 +2,6 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:compat="http://schemas.android.com/apk/res-auto">
<item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
android:id="@+id/menu_delete"
android:title="@string/menu.delete_cache"/>
</menu>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index 212feb04..2f0ab38a 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:compat="http://schemas.android.com/apk/res-auto">
- <item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
<item
android:id="@+id/menu_search"
android:icon="?attr/search"
diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml
index d5bfc2b2..ec4af96a 100644
--- a/res/menu/select_song.xml
+++ b/res/menu/select_song.xml
@@ -8,12 +8,6 @@
compat:showAsAction="always|withText"/>
<item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
android:id="@+id/menu_shuffle"
android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml
index 0b482a5e..6915c873 100644
--- a/res/menu/select_song_offline.xml
+++ b/res/menu/select_song_offline.xml
@@ -8,12 +8,6 @@
compat:showAsAction="always|withText"/>
<item
- android:id="@+id/menu_refresh"
- android:icon="?attr/refresh"
- android:title="@string/menu.refresh"
- compat:showAsAction="always|withText"/>
-
- <item
android:id="@+id/menu_shuffle"
android:icon="?attr/shuffle"
android:title="@string/menu.shuffle"
diff --git a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
index ba2aad1a..dc9c0e85 100644
--- a/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
@@ -172,7 +172,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter
}
else if(hideButtons && !showAll) {
if(albumListType != null) {
- menuInflater.inflate(R.menu.select_album_list, menu);
+ menuInflater.inflate(R.menu.empty, menu);
} else {
menuInflater.inflate(R.menu.select_album, menu);
}
diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index a8539723..015aa1de 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -137,9 +137,6 @@ public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnR
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case R.id.menu_refresh:
- refresh(true);
- return true;
case R.id.menu_shuffle:
onShuffleRequested();
return true;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 05:01:12 +0000