tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor menu xml files and shortcut type package

Browse source
This commit is contained in:
dkanada 2021-05-06 14:45:09 +09:00
commit e68c11f38e
14 changed files with 54 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/dkanada/gramophone/views/shortcuts/AppShortcutLauncherActivity.java
View file

@ -5,9 +5,9 @@ import android.content.Intent;
import android.os.Bundle;
import com.dkanada.gramophone.BuildConfig;
import com.dkanada.gramophone.views.shortcuts.shortcuttype.LatestShortcutType;
import com.dkanada.gramophone.views.shortcuts.shortcuttype.ShuffleShortcutType;
import com.dkanada.gramophone.views.shortcuts.shortcuttype.FrequentShortcutType;
import com.dkanada.gramophone.views.shortcuts.type.LatestShortcutType;
import com.dkanada.gramophone.views.shortcuts.type.ShuffleShortcutType;
import com.dkanada.gramophone.views.shortcuts.type.FrequentShortcutType;
import com.dkanada.gramophone.model.Playlist;
import com.dkanada.gramophone.service.MusicService;

6
app/src/main/java/com/dkanada/gramophone/views/shortcuts/DynamicShortcutManager.java
View file

@ -8,9 +8,9 @@ import android.content.pm.ShortcutManager;
import android.graphics.drawable.Icon;
import android.os.Build;
import com.dkanada.gramophone.views.shortcuts.shortcuttype.LatestShortcutType;
import com.dkanada.gramophone.views.shortcuts.shortcuttype.ShuffleShortcutType;
import com.dkanada.gramophone.views.shortcuts.shortcuttype.FrequentShortcutType;
import com.dkanada.gramophone.views.shortcuts.type.LatestShortcutType;
import com.dkanada.gramophone.views.shortcuts.type.ShuffleShortcutType;
import com.dkanada.gramophone.views.shortcuts.type.FrequentShortcutType;
import java.util.Arrays;
import java.util.List;

2
app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/BaseShortcutType.java → app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/BaseShortcutType.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.views.shortcuts.shortcuttype;
package com.dkanada.gramophone.views.shortcuts.type;
import android.annotation.TargetApi;
import android.content.Context;

2
app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/FrequentShortcutType.java → app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/FrequentShortcutType.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.views.shortcuts.shortcuttype;
package com.dkanada.gramophone.views.shortcuts.type;
import android.annotation.TargetApi;
import android.content.Context;

2
app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/LatestShortcutType.java → app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/LatestShortcutType.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.views.shortcuts.shortcuttype;
package com.dkanada.gramophone.views.shortcuts.type;
import android.annotation.TargetApi;
import android.content.Context;

2
app/src/main/java/com/dkanada/gramophone/views/shortcuts/shortcuttype/ShuffleShortcutType.java → app/src/main/java/com/dkanada/gramophone/views/shortcuts/type/ShuffleShortcutType.java
View file

@ -1,4 +1,4 @@
package com.dkanada.gramophone.views.shortcuts.shortcuttype;
package com.dkanada.gramophone.views.shortcuts.type;
import android.annotation.TargetApi;
import android.content.Context;

8
app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
View file

@ -1,32 +1,40 @@
<?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_play_next"
android:title="@string/action_play_next"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_queue"
android:title="@string/action_add_to_queue"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_album"
android:title="@string/action_go_to_album"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
app:showAsAction="never" />
<item
android:id="@+id/action_share"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never" />
</menu>

8
app/src/main/res/menu/menu_item_playing_queue_song.xml
View file

@ -1,33 +1,41 @@
<?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_play_next"
android:title="@string/action_play_next"
app:showAsAction="never" />
<item
android:id="@+id/action_remove_from_queue"
android:title="@string/action_remove_from_queue"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_album"
android:title="@string/action_go_to_album"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
app:showAsAction="never" />
<item
android:id="@+id/action_share"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:visible="false"
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never" />
</menu>

5
app/src/main/res/menu/menu_item_playlist.xml
View file

@ -4,18 +4,23 @@
<item
android:id="@+id/action_play"
android:title="@string/action_play" />
<item
android:id="@+id/action_play_next"
android:title="@string/action_play_next" />
<item
android:id="@+id/action_add_to_queue"
android:title="@string/action_add_to_queue" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist" />
<item
android:id="@+id/action_rename_playlist"
android:title="@string/action_rename" />
<item
android:id="@+id/action_delete_playlist"
android:title="@string/action_delete" />

9
app/src/main/res/menu/menu_item_playlist_song.xml
View file

@ -1,36 +1,45 @@
<?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_remove_from_playlist"
android:title="@string/action_remove_from_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_play_next"
android:title="@string/action_play_next"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_queue"
android:title="@string/action_add_to_queue"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_album"
android:title="@string/action_go_to_album"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
app:showAsAction="never" />
<item
android:id="@+id/action_share"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never" />
</menu>

9
app/src/main/res/menu/menu_item_song.xml
View file

@ -1,36 +1,45 @@
<?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_play_next"
android:title="@string/action_play_next"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_queue"
android:title="@string/action_add_to_queue"
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_album"
android:title="@string/action_go_to_album"
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
app:showAsAction="never" />
<item
android:id="@+id/action_share"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never" />
<item
android:id="@+id/action_download"
android:title="@string/action_download"
app:showAsAction="never" />
</menu>

1
app/src/main/res/menu/menu_player.xml
View file

@ -25,4 +25,5 @@
android:orderInCategory="1"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
</menu>

3
app/src/main/res/menu/menu_playlist_detail.xml
View file

@ -24,7 +24,8 @@
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist" />
android:title="@string/action_add_to_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_rename_playlist"

2
app/src/main/res/menu/menu_search.xml
View file

@ -1,10 +1,12 @@
<?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/search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/action_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView" />
</menu>