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

Clean up

Browse source
This commit is contained in:
Karim Abou Zeid 2018-06-05 22:45:29 +02:00
commit 614f28e0c9
23 changed files with 220 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/res/drawable/ic_select_all_white_24dp.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FFFFFF"
android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" />
</vector>

12
app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
View file

@ -6,18 +6,24 @@
android:id="@+id/action_play_next"
android:icon="@drawable/ic_redo_white_24dp"
android:title="@string/action_play_next"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_current_playing"
android:icon="@drawable/ic_library_add_white_24dp"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_playlist"
android:icon="@drawable/ic_playlist_add_white_24dp"
android:title="@string/action_add_to_playlist"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@id/action_multi_select_adapter_check_all"
android:icon="@drawable/ic_select_all_white_24dp"
android:title="Select all"
app:showAsAction="ifRoom" />
</menu>

14
app/src/main/res/menu/menu_media_selection.xml
View file

@ -6,24 +6,30 @@
android:id="@+id/action_play_next"
android:icon="@drawable/ic_redo_white_24dp"
android:title="@string/action_play_next"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_current_playing"
android:icon="@drawable/ic_library_add_white_24dp"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_playlist"
android:icon="@drawable/ic_playlist_add_white_24dp"
android:title="@string/action_add_to_playlist"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_delete_from_device"
android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/action_delete_from_device"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@id/action_multi_select_adapter_check_all"
android:icon="@drawable/ic_select_all_white_24dp"
android:title="Select all"
app:showAsAction="ifRoom" />
</menu>

20
app/src/main/res/menu/menu_playlists_selection.xml
View file

@ -6,24 +6,36 @@
android:id="@+id/action_play_next"
android:icon="@drawable/ic_redo_white_24dp"
android:title="@string/action_play_next"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_current_playing"
android:icon="@drawable/ic_library_add_white_24dp"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_playlist"
android:icon="@drawable/ic_playlist_add_white_24dp"
android:title="@string/action_add_to_playlist"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_save_playlist"
android:icon="@drawable/ic_save_white_24dp"
android:title="@string/save_playlists_title"
app:showAsAction="never" />
<item
android:id="@+id/action_delete_playlist"
android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/delete_playlists_title"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@id/action_multi_select_adapter_check_all"
android:icon="@drawable/ic_select_all_white_24dp"
android:title="Select all"
app:showAsAction="ifRoom" />
</menu>

14
app/src/main/res/menu/menu_playlists_songs_selection.xml
View file

@ -6,24 +6,30 @@
android:id="@+id/action_play_next"
android:icon="@drawable/ic_redo_white_24dp"
android:title="@string/action_play_next"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_current_playing"
android:icon="@drawable/ic_library_add_white_24dp"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_add_to_playlist"
android:icon="@drawable/ic_playlist_add_white_24dp"
android:title="@string/action_add_to_playlist"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_remove_from_playlist"
android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/action_remove_from_playlist"
app:showAsAction="always" />
app:showAsAction="ifRoom" />
<item
android:id="@id/action_multi_select_adapter_check_all"
android:icon="@drawable/ic_select_all_white_24dp"
android:title="Select all"
app:showAsAction="ifRoom" />
</menu>

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

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="action_new_playlist" type="id" />
<item name="action_export_playlists" type="id" />
<item name="action_show_lyrics" type="id" />
<item name="action_album_sort_order_asc" type="id" />
@ -15,4 +14,6 @@
<item name="action_song_sort_order_artist" type="id" />
<item name="action_song_sort_order_album" type="id" />
<item name="action_song_sort_order_year" type="id" />
<item name="action_multi_select_adapter_check_all" type="id" />
</resources>

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

@ -48,7 +48,6 @@
<string name="lyrics">Lyrics</string>
<string name="album_or_artist_empty">The title or artist is empty.</string>
<string name="saving_changes">Saving changes</string>
<string name="saving_to_file">Saving to file…</string>
<string name="label_details">Details</string>
<string name="label_file_name">File name</string>
<string name="label_file_path">File path</string>
@ -88,6 +87,7 @@
<string name="delete_playlists_title">Delete playlists</string>
<string name="clear_playlist_title">Clear playlist</string>
<string name="save_playlist_title">Save as file</string>
<string name="save_playlists_title">Save as files</string>
<string name="add_playlist_title">"Add to playlist"</string>
<string name="action_shuffle_all">Shuffle all</string>
<string name="action_shuffle_album">Shuffle album</string>
@ -182,7 +182,6 @@
<string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
<string name="action_new_playlist">New playlist…</string>
<string name="new_playlist_title">New playlist</string>
<string name="export_playlists">Export playlists</string>
<string name="grid_size_1">1</string>
<string name="grid_size_2">2</string>
<string name="grid_size_3">3</string>
@ -234,6 +233,8 @@
<string name="folders">Folders</string>
<string name="saved_playlist_to">Saved playlist to %s.</string>
<string name="failed_to_save_playlist">Failed to save playlist (%s).</string>
<string name="saved_x_playlists_to_x">Saved %1$d playlists to %2$s.</string>
<string name="saved_x_playlists_to_x_failed_to_save_x">Saved %1$d playlists to %2$s, failed to save %3$d.</string>
<string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
<string name="some_files_are_not_listed_in_the_media_store">Some files are not listed in the media store.</string>
<string name="nothing_to_scan">Nothing to scan.</string>