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

Added a sleep timer

Browse source
This commit is contained in:
Karim Abou Zeid 2015-07-08 01:16:19 +02:00
commit 4d82b91465
25 changed files with 350 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-xhdpi/default_album_art.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 121 KiB

BIN
app/src/main/res/drawable-xxxhdpi/default_album_art.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 106 KiB

8
app/src/main/res/drawable/traditional_slider_thumb_dark.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size
android:height="16dp"
android:width="16dp" />
<solid android:color="@color/white" />
</shape>

29
app/src/main/res/layout/dialog_sleep_timer.xml Normal file
View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:seekarc="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.triggertrap.seekarc.SeekArc
android:id="@+id/seek_arc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="30dp"
seekarc:clockwise="false"
seekarc:max="120"
seekarc:progressColor="?colorAccent"
seekarc:rotation="180"
seekarc:startAngle="30"
seekarc:sweepAngle="300"
seekarc:thumb="?seek_arc_thumb_drawable" />
<TextView
android:id="@+id/timer_display"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAppearance="?android:textAppearanceLarge" />
</FrameLayout>

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

@ -1,13 +1,13 @@
<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.AlbumDetailActivity">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.kabouzeid.gramophone.ui.activities.AlbumDetailActivity">
<item
android:id="@+id/action_now_playing"
android:icon="@drawable/ic_play_circle_fill_white_24dp"
android:title="@string/action_now_playing"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_playing_queue"
@ -18,22 +18,27 @@
<item
android:id="@+id/action_shuffle_album"
android:title="@string/action_shuffle_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_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<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"
@ -15,14 +15,19 @@
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_playing_queue"
android:title="@string/action_playing_queue"
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item

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

@ -30,6 +30,11 @@
android:title="@string/action_re_download_artist_image"
app:showAsAction="never"/>
<item
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"

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

@ -1,35 +1,39 @@
<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">
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"/>
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_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"/>
app:showAsAction="never" />
<item
android:id="@+id/action_playing_queue"
android:icon="@drawable/ic_queue_music_white_24dp"
android:title="@string/action_playing_queue"
app:showAsAction="never"/>
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never"/>
app:showAsAction="never" />
</menu>

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

@ -3,16 +3,16 @@
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"
android:title="@string/action_playing_queue"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_toggle_favorite"
android:icon="@drawable/ic_favorite_outline_white_24dp"
android:title="@string/action_add_to_favorites"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_playing_queue"
android:icon="@drawable/ic_queue_music_white_24dp"
android:title="@string/action_playing_queue"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_shuffle_all"
android:title="@string/action_shuffle_all"
@ -33,17 +33,21 @@
android:id="@+id/action_share"
android:title="@string/action_share"
app:showAsAction="never" />
<item
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item
android:id="@+id/action_tag_editor"
android:title="@string/action_tag_editor"
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never" />
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"
android:title="@string/equalizer"
app:showAsAction="never" />
<item
android:id="@+id/action_details"
android:title="@string/action_details"
app:showAsAction="never" />
</menu>

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

@ -20,6 +20,11 @@
android:title="@string/action_shuffle_playlist"
app:showAsAction="never" />
<item
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item
android:id="@+id/action_equalizer"
android:orderInCategory="99"

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

@ -18,14 +18,19 @@
android:title="@string/new_playlist_action"
app:showAsAction="never" />
<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_playing_queue"
android:title="@string/action_playing_queue"
android:id="@+id/action_sleep_timer"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />
<item

2
app/src/main/res/values/attrs.xml
View file

@ -19,4 +19,6 @@
<attr name="toolbarPopupTheme" format="reference" />
<attr name="seek_arc_thumb_drawable" format="reference" />
</resources>

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

@ -4,7 +4,7 @@
<string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s</string>
<string name="the_audio_file">The Audio File</string>
<string name="do_you_want_to_set_x_as_ringtone">Do you want to set %1$s as your ringtone?</string>
<string name="x_has_been_set_as_ringtone">%1$s has been set as your ringtone.</string>
<string name="x_has_been_set_as_ringtone">%1$s has been set as your ringtone</string>
<string name="action_set_as_ringtone">Set as Ringtone</string>
<string name="action_share">Share</string>
<string name="action_settings">"Settings"</string>
@ -28,8 +28,8 @@
<string name="songs">Songs</string>
<string name="playlists">Playlists</string>
<string name="nothing_playing">Nothing is playing</string>
<string name="unplayable_file">An error occurred while attempting to play this song.</string>
<string name="biography_unavailable">We were not able to find a matching biography for this artist.</string>
<string name="unplayable_file">An error occurred while attempting to play this song</string>
<string name="biography_unavailable">Could not find a matching biography for this artist</string>
<string name="biography">Biography</string>
<string name="audio_focus_denied">No audio focus.</string>
<string name="tag_editor">Tag Editor</string>
@ -40,7 +40,7 @@
<string name="year">Year</string>
<string name="track">Track</string>
<string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
<string name="album_or_artist_empty">The album title or the album artist text field is empty.</string>
<string name="album_or_artist_empty">The album title or the album artist text field is empty</string>
<string name="writing_file_number">Writing file</string>
<string name="saving_changes">Saving changes…</string>
<string name="label_details">Details</string>
@ -62,13 +62,13 @@
<string name="updated_artist_image">Updated artist image.</string>
<string name="could_not_update_artist_image">Could not update artist image.</string>
<string name="updating">Updating…</string>
<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="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="inserted_x_songs_into_playlist">Inserted %1$d songs into this playlist.</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>
<string name="deleted_x_songs">Deleted %1$d songs</string>
@ -90,7 +90,7 @@
<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="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>
<string name="action_shuffle_artist">Shuffle Artist</string>
@ -171,4 +171,9 @@
<string name="download_from_last_fm">Download from Last.fm</string>
<string name="pick_from_local_storage">Pick from Local Storage</string>
<string name="web_search">Web Search</string>
<string name="action_sleep_timer">Sleep timer</string>
<string name="action_set">Set</string>
<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>
</resources>

2
app/src/main/res/values/styles_parents.xml
View file

@ -20,6 +20,7 @@
<item name="round_selector">@drawable/round_selector_dark</item>
<item name="rect_selector">@drawable/rect_selector_dark</item>
<item name="separator_color">@color/materialmusic_dark_separator_color</item>
<item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb_dark</item>
<item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
<item name="check_mark_color">@color/grey_900</item>
@ -52,6 +53,7 @@
<item name="round_selector">@drawable/round_selector</item>
<item name="rect_selector">@drawable/rect_selector</item>
<item name="separator_color">@color/materialmusic_separator_color</item>
<item name="seek_arc_thumb_drawable">@drawable/traditional_slider_thumb</item>
<item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
<item name="check_mark_color">@color/white</item>