Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'RetroMusicPlayer:dev' into feat/audio_focus_2

Browse source
This commit is contained in:
Doozy 2022-05-06 21:28:11 +03:00 • committed by GitHub
commit 51f772247a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
305 changed files with 2587 additions and 5938 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/res/values/arrays.xml
View file

@ -8,7 +8,7 @@
<item>@string/horizontal_flip</item>
<item>@string/hinge</item>
<item>@string/stack</item>
<item>@string/classic</item>
<item>@string/simple</item>
</array>
<string-array name="pref_album_cover_transform_values">
@ -53,8 +53,8 @@
</array>
<array name="pref_appbar_mode_titles">
<item>@string/collapsing</item>
<item>@string/simple</item>
<item>@string/expanded</item>
<item>@string/compact</item>
</array>
<string-array name="pref_appbar_mode_values">
@ -229,5 +229,4 @@
<item>@string/choose_image</item>
<item>@string/remove_image</item>
</string-array>
<string name="collapsing">Collapsing</string>
</resources>

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

@ -9,6 +9,7 @@
<string name="action_add_to_favorites">Add to favorites</string>
<string name="action_add_to_playing_queue">Add to playing queue</string>
<string name="action_add_to_playlist">Add to playlist</string>
<string name="action_cancel">Cancel</string>
<string name="action_cast">Cast</string>
<string name="action_clear_playing_queue">Clear playing queue</string>
<string name="action_cycle_repeat">Cycle repeat mode</string>
@ -54,7 +55,7 @@
<string name="add_action">Add</string>
<string name="add_playlist_title">"Add to playlist"</string>
<string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
<string name="added_song_count_to_playlist">Added %d song(s) to %s</string>
<string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</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="album">Album</string>
@ -103,6 +104,7 @@
<string name="bug_report_no_password">Please enter your valid GitHub password</string>
<string name="bug_report_no_title">Please enter an issue title</string>
<string name="bug_report_no_username">Please enter your valid GitHub username</string>
<string name="bug_report_success">Bug report successful</string>
<string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
<string name="bug_report_use_account">Send using GitHub account</string>
<string name="buy_now">Buy now</string>
@ -126,6 +128,7 @@
<string name="clear_playing_queue">Clear queue</string>
<string name="color">Color</string>
<string name="colors">Colors</string>
<string name="compact">Compact</string>
<string name="composer">Composer</string>
<string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
<string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
@ -168,6 +171,7 @@
<string name="edit_synced_lyrics">Edit Synced Lyrics</string>
<string name="empty">Empty</string>
<string name="equalizer">Equalizer</string>
<string name="expanded">Expanded</string>
<string name="faq">FAQ</string>
<string name="favorites">Favorites</string>
<string name="finish_last_song">Finish last song</string>
@ -355,7 +359,7 @@
<string name="pref_title_album_cover_style">Album cover theme</string>
<string name="pref_title_album_cover_transform">Album cover skip</string>
<string name="pref_title_app_shortcuts">Colored app shortcuts</string>
<string name="pref_title_appbar_mode">App bar mode</string>
<string name="pref_title_appbar_mode">Header style</string>
<string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
<string name="pref_title_audio_fade">Fade audio</string>
<string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
@ -535,5 +539,4 @@
<string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
<string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
<string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
<string name="bug_report_success">Bug report successful</string>
</resources>

22
app/src/main/res/values/styles.xml
View file

@ -7,7 +7,7 @@
<style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black" />
<style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
<item name="android:windowBackground">@color/window_color</item>
<item name="android:windowBackground">?colorSurface</item>
</style>
<style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DayNight.NoActionBar">
@ -133,7 +133,7 @@
<style name="MaterialPopupMenuStyle" parent="Widget.Material3.PopupMenu">
<item name="android:popupBackground">@drawable/popup_background</item>
</style>
<style name="CenteredCheckBoxTheme">
<item name="checkboxStyle">@style/CheckBoxStyle</item>
</style>
@ -142,23 +142,7 @@
<item name="android:gravity">center_vertical|end</item>
</style>
<style name="MaterialAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="materialAlertDialogBodyTextStyle">
@style/AppTextAppearance.MaterialAlertDialog.Body
</item>
<item name="materialAlertDialogTitleTextStyle">
@style/AppTextAppearance.MaterialAlertDialog.Title
</item>
<item name="buttonBarPositiveButtonStyle">
@style/AppTextAppearance.MaterialAlertDialog.Button
</item>
<item name="buttonBarNegativeButtonStyle">
@style/AppTextAppearance.MaterialAlertDialog.Button
</item>
<item name="buttonBarNeutralButtonStyle">
@style/AppTextAppearance.MaterialAlertDialog.Button
</item>
</style>
<style name="MaterialAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog" />
<style name="AppTextAppearance.MaterialAlertDialog.Button" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textSize">16sp</item>

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

@ -22,7 +22,7 @@
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="colorSurface">@color/darkColorSurface</item>
<item name="android:windowBackground">@color/window_color_dark</item>
<item name="android:windowBackground">?colorSurface</item>
<item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
<item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
<item name="elevationOverlayColor">@color/elevationOverlay</item>
@ -35,6 +35,7 @@
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
<item name="colorSurface">@color/blackColorSurface</item>
<item name="android:windowBackground">?colorSurface</item>
<item name="colorOnBackground">@color/blackColorSurface</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
@ -47,7 +48,7 @@
<item name="roundSelector">@drawable/round_selector</item>
<item name="rectSelector">@drawable/rect_selector</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="android:windowBackground">@color/md_white_1000</item>
<item name="android:windowBackground">?colorSurface</item>
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>