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

Lots of progress with dynamic theming, the nav drawer now uses a RecyclerView, AboutDeveloperDialogHelper is now a DialogFragment, RTL support (to suppress Lint warnings), other various small fixes, cleaned up and formatted lot of code (and removed un-used resources), R.string.ok > android.R.string.ok, R.string.cancel > android.R.string.cancel, switched dialog helpers to DialogFragments.

Browse source
This commit is contained in:
Aidan Follestad 2015-04-16 16:47:02 -05:00
commit 7ce86afd74
265 changed files with 2853 additions and 2292 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,4 +35,5 @@
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never"/>
</menu>

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

@ -1,27 +1,29 @@
<?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">
<menu xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_outline_white_24dp"
android:title="@string/action_current_playing"
app:showAsAction="always"/>
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"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_shuffle_all"
android:title="@string/shuffle_all"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_playing_queue"
android:title="@string/action_playing_queue"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_grid_columns"
@ -29,25 +31,26 @@
<menu>
<group
android:id="@+id/gridSizeGroup"
android:checkableBehavior="single">
android:checkableBehavior="single"
tools:ignore="HardcodedText">
<item
android:id="@+id/gridSizeOne"
android:title="1"/>
android:title="1" />
<item
android:id="@+id/gridSizeTwo"
android:title="2"/>
android:title="2" />
<item
android:id="@+id/gridSizeThree"
android:title="3"/>
android:title="3" />
<item
android:id="@+id/gridSizeFour"
android:title="4"/>
android:title="4" />
<item
android:id="@+id/gridSizeFive"
android:title="5"/>
android:title="5" />
<item
android:id="@+id/gridSizeSix"
android:title="6"/>
android:title="6" />
</group>
</menu>
</item>
@ -56,17 +59,6 @@
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
<item
android:id="@+id/action_about"
android:orderInCategory="101"
android:title="@string/action_about"
app:showAsAction="never"/>
</menu>

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

@ -35,4 +35,5 @@
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never"/>
</menu>

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

@ -1,37 +1,37 @@
<?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">
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"/>
app:showAsAction="never" />
<item
android:id="@+id/action_remove_from_playing_queue"
android:title="@string/action_remove_from_playing_queue"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_album"
android:title="@string/action_go_to_album"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_tag_editor"
android:title="@string/action_tag_editor"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_delete_from_disk"
android:title="@string/action_delete_from_disk"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

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

@ -3,7 +3,6 @@
<item
android:id="@+id/action_rename_playlist"
android:title="@string/rename_playlist"/>
<item
android:id="@+id/action_delete_playlist"
android:title="@string/delete_playlist"/>

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

@ -1,40 +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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_delete_from_playlist"
android:title="@string/action_delete_from_playlist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_play_next"
android:title="@string/action_play_next"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_current_playing"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_album"
android:title="@string/action_go_to_album"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_tag_editor"
android:title="@string/action_tag_editor"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_delete_from_disk"
android:title="@string/action_delete_from_disk"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

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

@ -1,36 +1,36 @@
<?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">
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"/>
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_current_playing"
android:title="@string/action_add_to_playing_queue"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_add_to_playlist"
android:title="@string/action_add_to_playlist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_album"
android:title="@string/action_go_to_album"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_go_to_artist"
android:title="@string/action_go_to_artist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_tag_editor"
android:title="@string/action_tag_editor"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_delete_from_disk"
android:title="@string/action_delete_from_disk"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

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

@ -32,15 +32,4 @@
android:title="@string/equalizer"
app:showAsAction="never"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
<item
android:id="@+id/action_about"
android:orderInCategory="101"
android:title="@string/action_about"
app:showAsAction="never"/>
</menu>

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

@ -2,6 +2,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.kabouzeid.gramophone.ui.activities.MusicControllerActivity">
<item
android:id="@+id/action_playing_queue"
android:icon="@drawable/ic_queue_music_white_24dp"

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

@ -1,26 +1,29 @@
<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="com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.kabouzeid.gramophone.ui.activities.PlaylistDetailActivity">
<item
android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_outline_white_24dp"
android:title="@string/action_current_playing"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_playing_queue"
android:title="@string/action_playing_queue"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

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

@ -1,48 +1,36 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_current_playing"
android:icon="@drawable/ic_play_circle_outline_white_24dp"
android:title="@string/action_current_playing"
app:showAsAction="always"/>
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"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_new_playlist"
android:title="@string/action_new_playlist"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_shuffle_all"
android:title="@string/shuffle_all"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_playing_queue"
android:title="@string/action_playing_queue"
app:showAsAction="never"/>
app:showAsAction="never" />
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
android:title="@string/action_settings"
app:showAsAction="never"/>
<item
android:id="@+id/action_about"
android:orderInCategory="101"
android:title="@string/action_about"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

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

@ -1,11 +1,11 @@
<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="com.kabouzeid.gramophone.ui.activities.SearchActivity">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.kabouzeid.gramophone.ui.activities.SearchActivity">
<item
android:id="@+id/action_search"
android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
android:title="@string/action_search"
app:actionViewClass="android.support.v7.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView"/>
app:showAsAction="ifRoom|collapseActionView" />
</menu>