Merge branch 'master' into phonograph_pro
# Conflicts: # app/src/main/res/values/strings.xml
This commit is contained in:
Karim Abou Zeid
commit
69bb951e1d
49 changed files with 1 additions and 961 deletions
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
<dimen name="default_item_margin">16dp</dimen>
|
||||
|
||||
<dimen name="navigation_drawer_header_height">156dp</dimen>
|
||||
|
||||
<dimen name="title_view_height">72dp</dimen>
|
||||
<dimen name="toolbar_elevation">4dp</dimen>
|
||||
<dimen name="card_elevation">2dp</dimen>
|
||||
|
|
@ -27,32 +25,14 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
|
|||
<dimen name="pause_bar_distance">4dp</dimen>
|
||||
<dimen name="pause_bar_height">14dp</dimen>
|
||||
|
||||
<dimen name="color_view_border">1dp</dimen>
|
||||
|
||||
<dimen name="empty_text_size">20sp</dimen>
|
||||
|
||||
<dimen name="seek_bar_margin_left_right">-17dp</dimen>
|
||||
<dimen name="list_padding_vertical">2dp</dimen>
|
||||
|
||||
<dimen name="notification_big_image_size">128dp</dimen>
|
||||
|
||||
<dimen name="scrollbar_width">8dp</dimen>
|
||||
<dimen name="scrollbar_inset">8dp</dimen>
|
||||
<!-- MUST BE THE RESULT OF WIDTH PLUS INSET-->
|
||||
<dimen name="scrollbar_width_plus_inset">16dp</dimen>
|
||||
|
||||
<!-- ONLY 0dp WHILE THERE IS THE BUG IN DESIGN SUPPORT LIBRARY 22.2.0-->
|
||||
<dimen name="fab_margin_top_left_right">0dp</dimen>
|
||||
<dimen name="tmp_now_playing_skip_rewind_margin">-24dp</dimen>
|
||||
|
||||
<dimen name="title_box_padding_small">16dp</dimen>
|
||||
<dimen name="title_box_padding_large">32dp</dimen>
|
||||
<dimen name="title_box_title_text_size_small">@dimen/abc_text_size_title_material</dimen>
|
||||
<dimen name="title_box_title_text_size_large">24sp</dimen>
|
||||
<dimen name="title_box_caption_text_size_small">@dimen/abc_text_size_caption_material</dimen>
|
||||
<dimen name="title_box_caption_text_size_large">14sp</dimen>
|
||||
<dimen name="title_box_text_spacing_small">0dp</dimen>
|
||||
<dimen name="title_box_text_spacing_large">2dp</dimen>
|
||||
|
||||
<!-- For use with 24dp drawables in the item_list layouts-->
|
||||
<dimen name="list_item_image_icon_padding">8dp</dimen>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
<string name="aachen_germany" translatable="false">Aachen, Germany</string>
|
||||
|
||||
<string name="google_plus" translatable="false">Google Plus</string>
|
||||
<string name="twitter" translatable="false">Twitter</string>
|
||||
<string name="git_hub" translatable="false">GitHub</string>
|
||||
|
||||
<string name="card">Card</string>
|
||||
|
|
@ -40,5 +39,4 @@
|
|||
}
|
||||
</string>
|
||||
|
||||
<string name="id_shortcuttype">com.kabouzeid.gramophone.appshortcuts.ShortcutType</string>
|
||||
</resources>
|
||||
|
|
@ -2,6 +2,5 @@
|
|||
<resources>
|
||||
|
||||
<!-- bold -->
|
||||
<string name="font_fontFamily_medium" translatable="false">sans-serif</string>
|
||||
|
||||
</resources>
|
||||
|
|
@ -9,5 +9,4 @@
|
|||
<integer name="max_columns">4</integer>
|
||||
<integer name="max_columns_land">6</integer>
|
||||
|
||||
<integer name="font_textStyle_medium">1</integer>
|
||||
</resources>
|
||||
|
|
@ -3,18 +3,13 @@
|
|||
<string name="what_do_you_want_to_share">What do you want to share?</string>
|
||||
<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">Set %1$s 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>
|
||||
<string name="action_grant">Grant</string>
|
||||
<string name="action_done">Done</string>
|
||||
<string name="action_skip">Skip</string>
|
||||
<string name="action_about">About</string>
|
||||
<string name="action_show_intro">Show intro</string>
|
||||
<string name="action_clear_playlist">Clear playlist</string>
|
||||
<string name="action_playing_queue">Playing queue</string>
|
||||
<string name="action_add_to_favorites">Add to favorites</string>
|
||||
<string name="action_remove_from_favorites">Remove from favorites</string>
|
||||
<string name="action_search">Search</string>
|
||||
|
|
@ -48,7 +43,6 @@
|
|||
<string name="genre">Genre</string>
|
||||
<string name="album_artist">Album artist</string>
|
||||
<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="lyrics">Lyrics</string>
|
||||
<string name="album_or_artist_empty">The title or artist is empty.</string>
|
||||
|
|
@ -65,11 +59,9 @@
|
|||
<string name="action_go_to_artist">Go to artist</string>
|
||||
<string name="action_go_to_album">Go to album</string>
|
||||
<string name="label_playing_queue">Playing queue</string>
|
||||
<string name="save_as_playlist">Save as playlist</string>
|
||||
<string name="no_results">No results</string>
|
||||
<string name="action_re_download_artist_image">Update artist image</string>
|
||||
<string name="updated_artist_image">Artist image updated.</string>
|
||||
<string name="could_not_update_artist_image">Couldn\u2019t 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>
|
||||
|
|
@ -78,7 +70,6 @@
|
|||
<string name="action_grid_size_land">Grid size (land)</string>
|
||||
<string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</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>
|
||||
<string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
|
||||
<string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
|
||||
|
|
@ -138,13 +129,6 @@
|
|||
<string name="pref_title_classic_notification">Classic notification design</string>
|
||||
<string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
|
||||
<string name="pref_title_gapless_playback">Gapless playback</string>
|
||||
<string name="pref_title_force_square_album_art">Square album cover</string>
|
||||
<string name="pref_title_opaque_toolbar_now_playing">Opaque toolbar</string>
|
||||
<string name="pref_title_opaque_statusbar_now_playing">Opaque statusbar</string>
|
||||
<string name="pref_title_larger_title_box_now_playing">Larger title box</string>
|
||||
<string name="pref_title_alternative_progress_slider_now_playing">Alternative progress slider</string>
|
||||
<string name="pref_title_playback_controller_card_now_playing">Show card below playback controls</string>
|
||||
<string name="pref_title_colored_playback_controls_now_playing">Colored playback controls</string>
|
||||
<string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
|
||||
<string name="pref_title_last_added_interval">Last added playlist interval</string>
|
||||
<string name="pref_title_synchronized_lyrics_show">Show synchronized lyrics</string>
|
||||
|
|
@ -156,8 +140,6 @@
|
|||
<string name="rename_action">Rename</string>
|
||||
<string name="create_action">Create</string>
|
||||
<string name="x_selected">%1$d selected</string>
|
||||
<string name="select">Select</string>
|
||||
<string name="default_str">Default</string>
|
||||
<string name="primary_color">Primary color</string>
|
||||
<string name="accent_color">Accent color</string>
|
||||
<string name="primary_color_desc">The primary theme color, defaults to indigo.</string>
|
||||
|
|
@ -176,21 +158,13 @@
|
|||
<string name="pref_summary_classic_notification">Use the classic notification design.</string>
|
||||
<string name="pref_summary_colored_notification">"Colors the notification in the album cover\u2019s vibrant color."</string>
|
||||
<string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
|
||||
<string name="pref_summary_force_square_album_art">Album covers in the now playing view are always squared.</string>
|
||||
<string name="pref_summary_opaque_toolbar_now_playing">Colors the toolbar.</string>
|
||||
<string name="pref_summary_opaque_statusbar_now_playing">Colors the statusbar.</string>
|
||||
<string name="pref_summary_larger_title_box_now_playing">The title box is higher.</string>
|
||||
<string name="pref_summary_alternative_progress_slider_now_playing">Uses a progressbar which does not cover the album art instead of the default progress slider.</string>
|
||||
<string name="pref_summary_playback_controller_card_now_playing">Shows a card below play/pause, skip, rewind, shuffle and repeat.</string>
|
||||
<string name="pref_summary_ignore_media_store_artwork">Can increase the album cover quality but causes slower image loading times. Only enable this if you have problems with low resolution artworks.</string>
|
||||
<string name="pref_summary_colored_playback_controls_now_playing">Colors play/pause, shuffle and repeat as well as the progress slider in the album cover\u2019s vibrant color.</string>
|
||||
<string name="pref_summary_colored_navigation_bar">Colors the navigation bar in the primary color.</string>
|
||||
<string name="pref_summary_colored_app_shortcuts">Colors the app shortcuts in the primary color.</string>
|
||||
<string name="pref_summary_audio_ducking">Notifications, navigation etc.</string>
|
||||
<string name="pref_summary_synchronized_lyrics_show">Currently only synchronized lyrics in LRC format are supported. Either embedded or as a separate file.</string>
|
||||
<string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
|
||||
<string name="search_hint">Search your library…</string>
|
||||
<string name="rescanning_media">Rescanning media…</string>
|
||||
<string name="favorites">Favorites</string>
|
||||
<string name="last_added">Last added</string>
|
||||
<string name="history">History</string>
|
||||
|
|
@ -220,7 +194,6 @@
|
|||
<string name="licenses">Licenses</string>
|
||||
<string name="permissions_denied">Permissions denied.</string>
|
||||
<string name="permission_external_storage_denied">Permission to access external storage denied.</string>
|
||||
<string name="back">back</string>
|
||||
<string name="support_development">Support development</string>
|
||||
<string name="buy_pro">Buy Phonograph Pro</string>
|
||||
<string name="thank_you">Thank you!</string>
|
||||
|
|
@ -228,7 +201,6 @@
|
|||
<string name="restored_previous_purchases_please_restart">Restored previous purchases. Please restart the app to make use of all features.</string>
|
||||
<string name="play_store_illustration_by">Play Store illustration by</string>
|
||||
<string name="version">Version</string>
|
||||
<string name="application">Application</string>
|
||||
<string name="author">Author</string>
|
||||
<string name="write_an_email">Write an email</string>
|
||||
<string name="add_to_google_plus_circles">Add to Google Plus circles</string>
|
||||
|
|
@ -255,7 +227,6 @@
|
|||
<string name="up_next">Up next</string>
|
||||
<string name="pref_title_now_playing_screen_appearance">Appearance</string>
|
||||
<string name="intro_label">Introduction</string>
|
||||
<string name="press_back_again_to_exit_intro">Press back again to skip the intro.</string>
|
||||
<string name="welcome_to_phonograph">"Welcome to Phonograph, a beautiful and lightweight music player for Android. "</string>
|
||||
<string name="open_playing_queue_instruction">Swipe the card in the now playing screen up to reveal the full playing queue.</string>
|
||||
<string name="rearrange_playing_queue_instruction">Rearrange the playing queue by dragging a song from its track number.</string>
|
||||
|
|
|
|||
|
|
@ -21,23 +21,12 @@
|
|||
<item name="android:focusable">false</item>
|
||||
</style>
|
||||
|
||||
<style name="PlayingIndicator">
|
||||
<item name="android:layout_width">36dp</item>
|
||||
<item name="android:layout_height">36dp</item>
|
||||
<item name="android:padding">8dp</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
</style>
|
||||
|
||||
<style name="Fab" parent="FabParent" />
|
||||
|
||||
<style name="MusicProgressSlider" parent="MusicProgressSliderParent">
|
||||
<item name="android:thumbOffset">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="TraditionalMusicProgressSlider" parent="TraditionalMusicProgressSliderParent">
|
||||
<item name="android:thumbOffset">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Toolbar">
|
||||
<item name="titleMarginStart">16dp</item>
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
|
|
|
|||
|
|
@ -80,13 +80,6 @@
|
|||
<item name="android:thumb">@drawable/slider_thumb</item>
|
||||
</style>
|
||||
|
||||
<style name="TraditionalMusicProgressSliderParent">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_marginLeft">@dimen/seek_bar_margin_left_right</item>
|
||||
<item name="android:layout_marginRight">@dimen/seek_bar_margin_left_right</item>
|
||||
</style>
|
||||
|
||||
<!-- content description is necessary to find the overflow button later in the layout-->
|
||||
<style name="Widget.ActionButton.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
|
||||
<item name="android:contentDescription">@string/abc_action_menu_overflow_description</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue