Skip to content

Commit

Permalink
Merge branch 'dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@rene-coty
rene-coty authored Jan 17, 2024
2 parents 4be5935 + eb67f10 commit e3bb58a
Show file tree
Hide file tree
Showing 13 changed files with 278 additions and 255 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ A Material 3 YouTube Music client for Android

> **Warning**
>
>If you're in region that YouTube Music is not supported, you won't be able to use this app
***unless*** you have proxy or VPN to connect to a YTM supported region.
>If you're in a region where YouTube Music is not supported, you won't be able to use this app
***unless*** you have a proxy or VPN to connect to a YTM supported region.

## FAQ

Expand All @@ -66,7 +66,7 @@ recommend [Pano Scrobbler](https://play.google.com/store/apps/details?id=com.arn

## Contributing Translations

Follow the [instruction](https://developer.android.com/guide/topics/resources/localization) and
Follow the [instructions](https://developer.android.com/guide/topics/resources/localization) and
create a pull request. If possible, please build the app beforehand and make sure there is no error
before you create a pull request.

Expand All @@ -82,4 +82,4 @@ including bug fixes and new features.

I want to give credit to [vfsfitvnm/ViMusic](https://github.com/vfsfitvnm/ViMusic) for being an
example of Jetpack Compose music player. It helped me a lot on my way to learn Compose and
Android development.
Android development.
12 changes: 10 additions & 2 deletions app/src/main/java/com/zionhuang/music/playback/MusicService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ class MusicService : MediaLibraryService(),
lateinit var player: ExoPlayer
private lateinit var mediaSession: MediaLibrarySession

private var isAudioEffectSessionOpened = false

override fun onCreate() {
super.onCreate()
setMediaNotificationProvider(
Expand Down Expand Up @@ -469,6 +471,8 @@ class MusicService : MediaLibraryService(),
}

private fun openAudioEffectSession() {
if (isAudioEffectSessionOpened) return
isAudioEffectSessionOpened = true
sendBroadcast(
Intent(AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION).apply {
putExtra(AudioEffect.EXTRA_AUDIO_SESSION, player.audioSessionId)
Expand All @@ -479,9 +483,12 @@ class MusicService : MediaLibraryService(),
}

private fun closeAudioEffectSession() {
if (!isAudioEffectSessionOpened) return
isAudioEffectSessionOpened = false
sendBroadcast(
Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION).apply {
putExtra(AudioEffect.EXTRA_AUDIO_SESSION, player.audioSessionId)
putExtra(AudioEffect.EXTRA_PACKAGE_NAME, packageName)
}
)
}
Expand Down Expand Up @@ -511,8 +518,9 @@ class MusicService : MediaLibraryService(),
}

override fun onEvents(player: Player, events: Player.Events) {
if (events.containsAny(EVENT_PLAYBACK_STATE_CHANGED, EVENT_PLAY_WHEN_READY_CHANGED, EVENT_IS_PLAYING_CHANGED, EVENT_POSITION_DISCONTINUITY)) {
if (player.playbackState != STATE_ENDED && player.playWhenReady) {
if (events.containsAny(Player.EVENT_PLAYBACK_STATE_CHANGED, Player.EVENT_PLAY_WHEN_READY_CHANGED)) {
val isBufferingOrReady = player.playbackState == Player.STATE_BUFFERING || player.playbackState == Player.STATE_READY
if (isBufferingOrReady && player.playWhenReady) {
openAudioEffectSession()
} else {
closeAudioEffectSession()
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/res/values-be/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<string name="sleep_timer">Таймер рэжыму сну</string>
<string name="end_of_song">Канец песні</string>
<plurals name="minute">
<item quantity="one" tools:ignore="ImpliedQuantity">1 хвіліна</item>
<item quantity="one">%d хвіліна</item>
<item quantity="few">%d хвіліны</item>
<item quantity="many">%d хвілін</item>
<item quantity="other">%d хвілін</item>
Expand All @@ -200,11 +200,11 @@
<!-- Player action -->
<string name="action_like">Упадабаць</string>
<string name="action_remove_like">Выдаліць з упадабаных</string>
<string name="action_shuffle_on">Shuffle on</string>
<string name="action_shuffle_off">Shuffle off</string>
<string name="repeat_mode_off">Repeat mode off</string>
<string name="repeat_mode_one">Repeat current song</string>
<string name="repeat_mode_all">Repeat queue</string>
<string name="action_shuffle_on">Уключыць перамешванне</string>
<string name="action_shuffle_off">Выключыць перамешванне</string>
<string name="repeat_mode_off">Рэжым паўтору выключаны</string>
<string name="repeat_mode_one">Паўтарыць бягучую песню</string>
<string name="repeat_mode_all">Паўтарыць чаргу</string>

<!-- Queue Title -->
<string name="queue_all_songs">Усе песні</string>
Expand Down Expand Up @@ -282,7 +282,7 @@
<string name="about">Аб праграме</string>
<string name="app_version">Версія праграмы</string>

<string name="new_version_available">New version available</string>
<string name="translation_models">Translation Models</string>
<string name="clear_translation_models">Clear translation models</string>
<string name="new_version_available">Даступная новая версія</string>
<string name="translation_models">Мадэлі перакладу</string>
<string name="clear_translation_models">Ачысціць мадэлі перакладу</string>
</resources>
116 changes: 61 additions & 55 deletions app/src/main/res/values-cs/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,32 @@
</plurals>

<!-- Home -->
<string name="history">History</string>
<string name="stats">Stats</string>
<string name="mood_and_genres">Mood and Genres</string>
<string name="account">Account</string>
<string name="quick_picks">Quick picks</string>
<string name="quick_picks_empty">Listen to songs to generate your quick picks</string>
<string name="new_release_albums">New release albums</string>
<string name="history">Historie</string>
<string name="stats">Statistiky</string>
<string name="mood_and_genres">Nálada a žánry</string>
<string name="account">Účet</string>
<string name="quick_picks">Rychlý výběr</string>
<string name="quick_picks_empty">Pro vytvoření rychlého výběru si nejprve poslechněte pár skladeb</string>
<string name="new_release_albums">Nově vydaná alba</string>

<!-- History -->
<string name="today">Today</string>
<string name="yesterday">Yesterday</string>
<string name="this_week">This week</string>
<string name="last_week">Last week</string>
<string name="today">Dnes</string>
<string name="yesterday">Včera</string>
<string name="this_week">Tento týden</string>
<string name="last_week">Minulý týden</string>

<!-- Stats -->
<string name="most_played_songs">Most played songs</string>
<string name="most_played_artists">Most played artists</string>
<string name="most_played_albums">Most played albums</string>
<string name="most_played_songs">Nejčastěji přehrávané skladby</string>
<string name="most_played_artists">Nejčastěji přehrávaní umělci</string>
<string name="most_played_albums">Nejčastěji přehrávaná alba</string>

<!-- Search -->
<string name="search">Vyhledávání</string>
<string name="search_yt_music">Hledat v YouTube Music…</string>
<string name="search_library">Hledat v knihovně…</string>
<string name="filter_library">Library</string>
<string name="filter_liked">Liked</string>
<string name="filter_downloaded">Downloaded</string>
<string name="filter_library">Knihovna</string>
<string name="filter_liked">Oblíbené</string>
<string name="filter_downloaded">Stažené</string>
<string name="filter_all">Vše</string>
<string name="filter_songs">Skladby</string>
<string name="filter_videos">Videa</string>
Expand All @@ -49,16 +49,16 @@
<string name="filter_playlists">Playlisty</string>
<string name="filter_community_playlists">Komunitní playlisty</string>
<string name="filter_featured_playlists">Doporučené playlisty</string>
<string name="filter_bookmarked">Bookmarked</string>
<string name="no_results_found">No results found</string>
<string name="filter_bookmarked">Záložky</string>
<string name="no_results_found">Nenalezeny žádné výsledky</string>

<!-- Artist screen -->
<string name="from_your_library">Z vaší knihovny</string>

<!-- Playlist -->
<string name="liked_songs">Oblíbené skladby</string>
<string name="downloaded_songs">Stažené skladby</string>
<string name="playlist_is_empty">The playlist is empty</string>
<string name="playlist_is_empty">Playlist je prázdný</string>

<!-- Button -->
<string name="retry">Zkusit znovu</string>
Expand All @@ -76,7 +76,7 @@
<string name="add_to_library">Přidat do knihovny</string>
<string name="remove_from_library">Odebrat z knihovny</string>
<string name="download">Stáhnout</string>
<string name="downloading">Downloading</string>
<string name="downloading">Stahování</string>
<string name="remove_download">Odebrat stahování</string>
<string name="import_playlist">Importovat playlist</string>
<string name="add_to_playlist">Přidat do playlistu</string>
Expand All @@ -85,10 +85,10 @@
<string name="refetch">Obnovit</string>
<string name="share">Sdílet</string>
<string name="delete">Odstranit</string>
<string name="remove_from_history">Remove from history</string>
<string name="remove_from_history">Odstranit z historie</string>
<string name="search_online">Hledat online</string>
<string name="sync">Sync</string>
<string name="advanced">Advanced</string>
<string name="sync">Synchronizace</string>
<string name="advanced">Pokročilé</string>

<!-- Sort menu -->
<string name="sort_by_create_date">Datum přidání</string>
Expand All @@ -98,7 +98,7 @@
<string name="sort_by_song_count">Počet skladeb</string>
<string name="sort_by_length">Délka</string>
<string name="sort_by_play_time">Doba přehrávání</string>
<string name="sort_by_custom">Custom order</string>
<string name="sort_by_custom">Vlastní pořadí</string>

<!-- Dialog -->
<string name="media_id">ID média</string>
Expand Down Expand Up @@ -158,33 +158,39 @@
<item quantity="other">%d playlistů</item>
</plurals>
<plurals name="n_week" tools:ignore="MissingQuantity">
<item quantity="one">%d week</item>
<item quantity="other">%d weeks</item>
<item quantity="one">%d týden</item>
<item quantity="few">%d týdny</item>
<item quantity="many">%d týdnů</item>
<item quantity="other">%d týdnů</item>
</plurals>
<plurals name="n_month" tools:ignore="MissingQuantity">
<item quantity="one">%d month</item>
<item quantity="other">%d months</item>
<item quantity="one">%d měsíc</item>
<item quantity="few">%d měsíce</item>
<item quantity="many">%d měsíců</item>
<item quantity="other">%d měsíců</item>
</plurals>
<plurals name="n_year" tools:ignore="MissingQuantity">
<item quantity="one">%d year</item>
<item quantity="other">%d years</item>
<item quantity="one">%d rok</item>
<item quantity="few">%d roky</item>
<item quantity="many">%d let</item>
<item quantity="other">%d let</item>
</plurals>

<!-- Snackbar -->
<string name="playlist_imported">Playlist importován</string>
<string name="removed_song_from_playlist">Removed \"%s\" from playlist</string>
<string name="playlist_synced">Playlist synced</string>
<string name="undo">Undo</string>
<string name="removed_song_from_playlist">Skladba „%s“ odebrána z playlistu</string>
<string name="playlist_synced">Playlist synchronizován</string>
<string name="undo">Zrušit</string>

<!-- Player -->
<string name="lyrics_not_found">Texty nenalezeny</string>
<string name="sleep_timer">Sleep timer</string>
<string name="end_of_song">End of song</string>
<string name="sleep_timer">Časovač spánku</string>
<string name="end_of_song">Konec skladby</string>
<plurals name="minute">
<item quantity="one">1 minute</item>
<item quantity="few">%d minutes</item>
<item quantity="many">%d minutes</item>
<item quantity="other">%d minutes</item>
<item quantity="one">1 minuta</item>
<item quantity="few">%d minuty</item>
<item quantity="many">%d minut</item>
<item quantity="other">%d minut</item>
</plurals>
<string name="error_no_stream">Není dostupný žádný stream</string>
<string name="error_no_internet">Není dostupné připojení k internetu</string>
Expand All @@ -210,12 +216,12 @@
<!-- Settings -->
<string name="settings">Nastavení</string>
<string name="appearance">Vzhled</string>
<string name="enable_dynamic_theme">Enable dynamic theme</string>
<string name="enable_dynamic_theme">Povolit dynamický motiv</string>
<string name="dark_theme">Tmavý motiv</string>
<string name="dark_theme_on">Zap</string>
<string name="dark_theme_off">Vyp</string>
<string name="dark_theme_follow_system">Podle systému</string>
<string name="pure_black">Pure black</string>
<string name="pure_black">Čistě černá</string>
<string name="default_open_tab">Výchozí karta</string>
<string name="customize_navigation_tabs">Přizpůsobit navigační karty</string>
<string name="lyrics_text_position">Pozice textů</string>
Expand Down Expand Up @@ -245,21 +251,21 @@

<string name="storage">Úložiště</string>
<string name="cache">Mezipaměť</string>
<string name="image_cache">Image Cache</string>
<string name="song_cache">Song Cache</string>
<string name="max_cache_size">Max cache size</string>
<string name="unlimited">Unlimited</string>
<string name="clear_all_downloads">Clear all downloads</string>
<string name="image_cache">Mezipaměť obrázků</string>
<string name="song_cache">Mezipaměť skladeb</string>
<string name="max_cache_size">Maximální velikost mezipaměti</string>
<string name="unlimited">Neomezená</string>
<string name="clear_all_downloads">Vymazat všechna stahování</string>
<string name="max_image_cache_size">Maximální velikost mezipaměti obrázků</string>
<string name="clear_image_cache">Vymazat mezipaměť obrázků</string>
<string name="max_song_cache_size">Maximální velikost mezipaměti skladeb</string>
<string name="clear_song_cache">Clear song cache</string>
<string name="clear_song_cache">Vymazat mezipaměť skladeb</string>
<string name="size_used">Využito %s</string>

<string name="privacy">Soukromí</string>
<string name="pause_listen_history">Pause listen history</string>
<string name="clear_listen_history">Clear listen history</string>
<string name="clear_listen_history_confirm">Are you sure to clear all listen history?</string>
<string name="pause_listen_history">Pozastavit historii poslechu</string>
<string name="clear_listen_history">Vymazat historii poslechu</string>
<string name="clear_listen_history_confirm">Opravdu chcete vymazat celou historii poslechu?</string>
<string name="pause_search_history">Pozastavit historii vyhledávání</string>
<string name="clear_search_history">Vymazat historii vyhledávání</string>
<string name="clear_search_history_confirm">Opravdu chcete vymazat celou historii vyhledávání?</string>
Expand All @@ -268,15 +274,15 @@
<string name="backup_restore">Záloha a obnovení</string>
<string name="backup">Zálohovat</string>
<string name="restore">Obnovit</string>
<string name="imported_playlist">Imported playlist</string>
<string name="imported_playlist">Playlist importován</string>
<string name="backup_create_success">Záloha úspěšně vytvořena</string>
<string name="backup_create_failed">Nepodařilo se vytvořit zálohu</string>
<string name="restore_failed">Nepodařilo se obnovit zálohu</string>

<string name="about">O aplikaci</string>
<string name="app_version">Verze aplikace</string>

<string name="new_version_available">New version available</string>
<string name="translation_models">Translation Models</string>
<string name="clear_translation_models">Clear translation models</string>
<string name="new_version_available">Je dostupná nová verze</string>
<string name="translation_models">Modely překladů</string>
<string name="clear_translation_models">Vymazat modely překladů</string>
</resources>
Loading

0 comments on commit e3bb58a

Please sign in to comment.