diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt index 14abd5910..45377c3dc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt @@ -15,7 +15,6 @@ package code.name.monkey.retromusic.fragments.other import android.app.Activity -import android.app.AlertDialog import android.content.Intent import android.graphics.Bitmap import android.graphics.Color @@ -51,6 +50,7 @@ import com.bumptech.glide.request.RequestListener import com.bumptech.glide.request.target.Target import com.github.dhaval2404.imagepicker.ImagePicker import com.github.dhaval2404.imagepicker.constant.ImageProvider +import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.transition.MaterialContainerTransform import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -124,8 +124,7 @@ class UserInfoFragment : Fragment() { private fun showBannerImageOptions() { val list = requireContext().resources.getStringArray(R.array.image_settings_options) - val alertDialogBuilder = AlertDialog.Builder(context) - alertDialogBuilder.setTitle("Banner Image") + MaterialAlertDialogBuilder(requireContext()).setTitle("Banner Image") .setItems(list) { _, which -> when (which) { 0 -> selectBannerImage() @@ -137,13 +136,14 @@ class UserInfoFragment : Fragment() { } } } - alertDialogBuilder.create().show() + .setNegativeButton(R.string.action_cancel, null) + .create() + .show() } private fun showUserImageOptions() { val list = requireContext().resources.getStringArray(R.array.image_settings_options) - val alertDialogBuilder = AlertDialog.Builder(context) - alertDialogBuilder.setTitle("Profile Image") + MaterialAlertDialogBuilder(requireContext()).setTitle("Profile Image") .setItems(list) { _, which -> when (which) { 0 -> pickNewPhoto() @@ -155,7 +155,9 @@ class UserInfoFragment : Fragment() { } } } - alertDialogBuilder.create().show() + .setNegativeButton(R.string.action_cancel, null) + .create() + .show() } private fun loadProfile() { diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml index 566f2148d..50320cab6 100644 --- a/app/src/main/res/values-eu-rES/strings.xml +++ b/app/src/main/res/values-eu-rES/strings.xml @@ -123,21 +123,13 @@ %2$s-(r)en %1$s entzuten ari zara Nahiko iluna Erreprodukzio zerrenda ezabatu - - %1$s erreprodukzio zerrenda ezabatu?]]> - + %1$s erreprodukzio zerrenda ezabatu?]]> Erreprodukzio zerrendak ezabatu Delete song - - %1$s abestia ezabatu?]]> - + %1$s abestia ezabatu?]]> Delete songs - - %1$d erreprodukzio zerrenda ezabatu?]]> - - - %1$d abesti ezabatu?]]> - + %1$d erreprodukzio zerrenda ezabatu?]]> + %1$d abesti ezabatu?]]> %1$d abesti ezabatu dira Sakonera Azalpena @@ -145,9 +137,7 @@ Allow Retro Music to modify audio settings Set ringtone Zerrenda beltza garbitu nahi duzu? - - %1$s zerrenda beltzetik ezabatu nahi duzu?]]> - + %1$s zerrenda beltzetik ezabatu nahi duzu?]]> Lagundu diruz Nire lanagatik ordaindua izan behar dudala pentsatzen baduzu, diru apur bat utzi dezakezu hemen Erosidazu: @@ -232,9 +222,7 @@ Abestirik ez Normala Letra normalak - - %s ez dator dendan zerrendatua]]> - + %s ez dator dendan zerrendatua]]> Eskaneatzekorik ez Nothing to see Jakinarazpena @@ -350,13 +338,9 @@ Azala kendu Zerrenda beltzetik kendu Abestia erreprodukzio zerrendatik kendu - - %1$s abestia erreprodukzio zerrendatik kendu?]]> - + %1$s abestia erreprodukzio zerrendatik kendu?]]> Abestiak erreprodukzio zerrendatik kendu - - %1$d abesti erreprodukzio zerrendatik kendu?]]> - + %1$d abesti erreprodukzio zerrendatik kendu?]]> Erreprodukzio zerrenda berrizendatu Arazo baten berri eman Eman akatsen berri diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index ea44a730b..ef9cfbe34 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -86,9 +86,7 @@ https://play.google.com/store/apps/details?id=%s Modifica le impostazioni audio e regola i controlli dell\'equalizzatore Automatico Backup e ripristino impostazioni e playlist - - - + Backup Biografia Solo nero @@ -141,21 +139,13 @@ https://play.google.com/store/apps/details?id=%s Immagini dell\'Artista Personalizzate Scuro Elimina playlist - - %1$s?]]> - + %1$s?]]> Elimina playlist Elimina brano - - %1$s?]]> - + %1$s?]]> Elimina brani - - %1$d playlist?]]> - - - %1$d brani?]]> - + %1$d playlist?]]> + %1$d brani?]]> Eliminati %1$d brani Eliminazione brani Profondità @@ -165,9 +155,7 @@ https://play.google.com/store/apps/details?id=%s Imposta suoneria Numero del disco Vuoi cancellare la blacklist? - - %1$s dalla blacklist?]]> - + %1$s dalla blacklist?]]> Dona Se pensi che io meriti di essere pagato per il mio lavoro, puoi lasciarmi qualche soldo qui Pagami un: @@ -263,9 +251,7 @@ https://play.google.com/store/apps/details?id=%s Nessun brano Normale Testi normali - - %s non è presente nel Media Store.]]> - + %s non è presente nel Media Store.]]> Non riprodotto recentemente Niente da rilevare Non c\'è niente da vedere @@ -412,13 +398,9 @@ https://play.google.com/store/apps/details?id=%s Rimuovi copertina Rimuovi dalla blacklist Rimuovi il brano dalla playlist - - %1$s dalla playlist?]]> - + %1$s dalla playlist?]]> Rimuovi brani dalla playlist - - %1$d dalla playlist?]]> - + %1$d dalla playlist?]]> Rinomina playlist Sostituisci copertina Segnala un problema diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 010712c39..8a829b9f3 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -83,9 +83,7 @@ 更改声音设置或调整均衡器 自动 备份、恢复您的设置和播放列表 - - - + 备份 简介 纯黑 @@ -138,21 +136,13 @@ 自定义艺术家图像 深色 删除播放列表 - - %1$s 吗？]]> - + %1$s 吗？]]> 删除播放列表 删除歌曲 - - ％1$s？]]> - + ％1$s？]]> 删除歌曲 - - %1$d 个播放列表？]]> - - - %1$d 首歌曲？]]> - + %1$d 个播放列表？]]> + %1$d 首歌曲？]]> 已删除 %1$d 首歌曲。 正在删除歌曲 深度 @@ -162,9 +152,7 @@ 设为铃声 盘片编号 您想清空黑名单吗？ - - %1$s 吗？]]> - + %1$s 吗？]]> 捐赠 如果您认为应用还不错，可以通过捐赠支持我们 用以下方式捐赠： @@ -260,9 +248,7 @@ 暂无歌曲 正常 正常歌词 - - %s 未在媒体存储中列出。]]> - + %s 未在媒体存储中列出。]]> 最近未播放歌曲 无可检索。 空空如也 @@ -409,13 +395,9 @@ 移除封面 从黑名单中移除 从播放列表中删除歌曲 - - %1$s？]]> - + %1$s？]]> 从播放列表中删除歌曲 - - %1$d 首歌曲？]]> - + %1$d 首歌曲？]]> 重命名播放列表 Replace Cover 报告问题 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c12e783cd..90701124b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -54,6 +54,7 @@ Add "Add to playlist" Add Time Framed Lyrics + Added %d song(s) to %s "Added 1 title to the playing queue." Added %1$d titles to the playing queue. Album @@ -85,9 +86,7 @@ Change the sound settings and adjust the equalizer controls Auto Backup and restore your settings, playlists - - - + Backups Biography Just Black @@ -117,12 +116,14 @@ Cascading Changelog Check out What\'s New + Choose Image Choose what to restore Circle Circular Classic Clear Clear blacklist + Clear History Clear queue Color Colors @@ -138,23 +139,16 @@ Members and contributors Currently listening to %1$s by %2$s. Custom Artist Images + Share Crash Report Kinda Dark Delete playlist - - %1$s?]]> - + %1$s?]]> Delete playlists Delete song - - %1$s?]]> - + %1$s?]]> Delete songs - - %1$d playlists?]]> - - - %1$d songs?]]> - + %1$d playlists?]]> + %1$d songs?]]> Deleted %1$d songs. Deleting Songs Depth @@ -164,9 +158,7 @@ Set ringtone Disc Number Do you want to clear the blacklist? - - %1$s from the blacklist?]]> - + %1$s from the blacklist?]]> Donate If you think I deserve to get paid for my work, you can leave some money here Buy me a: @@ -206,7 +198,8 @@ Need more help? Hinge History - Clear History + History cleared + Undo Home Horizontal flip Image @@ -222,9 +215,9 @@ Bitrate Format File name - Last Modified File path Size + Last Modified More from %s Sampling rate Length @@ -264,9 +257,7 @@ You have no songs Normal Normal lyrics - - %s is not listed in the media store.]]> - + %s is not listed in the media store.]]> Not recently played Nothing to scan. Nothing to see @@ -295,11 +286,13 @@ Pinterest Follow Pinterest page for Retro Music design inspiration Plain + Playlist already exists Pitch Playback Settings Playback Speed The playing notification provides actions for play/pause etc. Playing notification + %s created successfully Playlist is empty Playlist name Playlists @@ -346,6 +339,7 @@ Configure visibility and order of library categories. Use Retro Music\'s custom lockscreen controls License details for open source software + When enabled, newly played songs won\'t show in history Navigate to the last used tab on start Display synced lyrics over album cover Show New Music Mix on homescreen @@ -356,7 +350,6 @@ If enough space is available, show volume controls in the now playing screen Extract accent color from wallpaper Only show music from /Music Folder - When enabled, newly played songs won\'t show in history Show album cover Navigate by Album Artist Album cover theme @@ -391,6 +384,7 @@ Lyrics type Now playing theme Open source licences + Pause history Remember last tab Show lyrics Show suggestions @@ -403,7 +397,6 @@ Volume controls Wallpaper accent color Whitelist music - Pause history Pro Black theme, Now playing themes, Carousel effect and more.. Profile @@ -416,14 +409,11 @@ Remove Remove cover Remove from blacklist + Remove Image Remove song from playlist - - %1$s from the playlist?]]> - + %1$s from the playlist?]]> Remove songs from playlist - - %1$d songs from the playlist?]]> - + %1$d songs from the playlist?]]> Rename playlist Replace Cover Report an issue @@ -545,12 +535,4 @@ You have to select at least one category. You will be forwarded to the issue tracker website. Your account data is only used for authentication. - Share Crash Report - %s created successfully - Playlist already exists - Added %d song(s) to %s - History cleared - Undo - Choose Image - Remove Image