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

Added native image loader support for artist images. Automatically recreate activity onrResume when colors changed fixes issues #2 and #39. Also Butterknife should be used now everywhere #40

Browse source
This commit is contained in:
Karim Abou Zeid 2015-07-14 04:08:43 +02:00
commit 8bdaf08a30
29 changed files with 485 additions and 521 deletions
Download patch file Download diff file Expand all files Collapse all files

69
app/src/main/res/menu/menu_albums.xml
View file

@ -1,69 +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=".DrawerActivity">
<item
android:id="@+id/action_now_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_now_playing"
app:showAsAction="always" />
<item
android:id="@+id/action_search"
android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
android:title="@string/action_search"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_playing_queue"
android:title="@string/action_playing_queue"
app:showAsAction="never" />
<item
android:id="@+id/action_shuffle_all"
android:title="@string/action_shuffle_all"
app:showAsAction="never" />
<item
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item
android:id="@+id/action_grid_columns"
android:title="@string/action_grid_columns">
<menu>
<group
android:id="@+id/gridSizeGroup"
android:checkableBehavior="single"
tools:ignore="HardcodedText">
<item
android:id="@+id/gridSizeOne"
android:title="1" />
<item
android:id="@+id/gridSizeTwo"
android:title="2" />
<item
android:id="@+id/gridSizeThree"
android:title="3" />
<item
android:id="@+id/gridSizeFour"
android:title="4" />
<item
android:id="@+id/gridSizeFive"
android:title="5" />
<item
android:id="@+id/gridSizeSix"
android:title="6" />
</group>
</menu>
</item>
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never" />
</menu>

36
app/src/main/res/menu/menu_main.xml
View file

@ -30,10 +30,44 @@
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item
android:id="@+id/action_view_as"
android:title="@string/action_view_as">
<menu>
<group
android:id="@+id/gridSizeGroup"
android:checkableBehavior="single"
tools:ignore="HardcodedText">
<item
android:id="@+id/gridSizeOne"
android:title="1" />
<item
android:id="@+id/gridSizeTwo"
android:title="2" />
<item
android:id="@+id/gridSizeThree"
android:title="3" />
<item
android:id="@+id/gridSizeFour"
android:title="4" />
<item
android:id="@+id/gridSizeFive"
android:title="5" />
<item
android:id="@+id/gridSizeSix"
android:title="6" />
</group>
<item
android:id="@+id/colored_footers"
android:checkable="true"
android:title="@string/colored_footers" />
</menu>
</item>
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never" />
</menu>
</menu>

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

@ -15,7 +15,7 @@
<item
android:id="@+id/action_new_playlist"
android:title="@string/new_playlist_action"
android:title="@string/new_playlist_title"
app:showAsAction="never" />
<item

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

@ -66,9 +66,10 @@
<string name="added_title_to_playing_queue">"Added 1 title to the playing queue"</string>
<string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue</string>
<string name="action_remove_from_playlist">Remove from playlist</string>
<string name="new_playlist_action">New playlist…</string>
<string name="action_grid_columns">Grid columns</string>
<string name="action_grid_columns_land">Grid columns (Land)</string>
<string name="action_view_as">View as</string>
<string name="action_view_as_land">View as (Land)</string>
<string name="inserted_x_songs_into_playlist">Inserted %1$d songs into this playlist</string>
<string name="created_playlist_x">Created playlist %1$s</string>
<string name="deleted_playlist_x">Deleted playlist %1$s</string>
@ -90,7 +91,6 @@
<string name="delete_playlists_title">Delete Playlists</string>
<string name="clear_playlist_title">Clear Playlist</string>
<string name="add_playlist_title">"Add to Playlist"</string>
<string name="new_playlist_title">New Playlist</string>
<string name="delete_warning">"Warning: This operation can not be undone"</string>
<string name="action_shuffle_all">Shuffle All</string>
<string name="action_shuffle_album">Shuffle Album</string>
@ -180,4 +180,9 @@
<string name="cancel_current_timer">Cancel current timer</string>
<string name="sleep_timer_canceled">Sleep timer has been canceled</string>
<string name="sleep_timer_set">Sleep timer set for %d minutes from now</string>
<string name="new_playlist_action">New playlist…</string>
<string name="new_playlist_title">New Playlist</string>
<string name="grid">Grid</string>
<string name="list">List</string>
<string name="colored_footers">Colored footers</string>
</resources>