diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt index 3344f8e05..bae8ceb87 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt @@ -27,6 +27,7 @@ import androidx.core.net.toUri import androidx.core.text.parseAsHtml import androidx.core.view.isVisible import code.name.monkey.appthemehelper.util.VersionUtils +import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity import code.name.monkey.retromusic.databinding.ActivityPermissionBinding import code.name.monkey.retromusic.extensions.* @@ -75,7 +76,8 @@ class PermissionActivity : AbsMusicServiceActivity() { val color = accentColor() val hexColor = String.format("#%06X", 0xFFFFFF and color) val appName = - "Hello there!
Welcome to Retro Music" + getString(R.string.message_welcome, + "Retro Music") .parseAsHtml() binding.appNameText.text = appName } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt index 8f30f8de3..8509c963e 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt @@ -154,7 +154,7 @@ class AlbumTagEditorActivity : AbsTagEditorActivity override fun onLoadFailed(errorDrawable: Drawable?) { super.onLoadFailed(errorDrawable) - showToast("Load Failed", Toast.LENGTH_LONG) + showToast(R.string.error_load_failed, Toast.LENGTH_LONG) } override fun setResource(resource: BitmapPaletteWrapper?) {} diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt index 27066c5b9..f5dc5b069 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt @@ -122,7 +122,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC try { file.delete() } catch (exception: SecurityException) { - showToast("Could not delete backup") + showToast(R.string.error_delete_backup) } backupViewModel.loadBackups() return true @@ -147,7 +147,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC file.renameTo(renamedFile) backupViewModel.loadBackups() } else { - showToast("File already exists") + showToast(R.string.file_already_exists) } } positiveButton(android.R.string.ok) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt index d1ce9c693..0083464b2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/LyricsFragment.kt @@ -141,8 +141,8 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) { binding.lyricsPager.adapter = lyricsSectionsAdapter TabLayoutMediator(binding.tabLyrics, binding.lyricsPager) { tab, position -> tab.text = when (position) { - 0 -> "Synced Lyrics" - 1 -> "Normal Lyrics" + 0 -> getString(R.string.synced_lyrics) + 1 -> getString(R.string.normal_lyrics) else -> "" } }.attach() @@ -383,7 +383,7 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics) { } fun loadLRCLyrics() { - binding.lyricsView.setLabel("Empty") + binding.lyricsView.setLabel(getString(R.string.empty)) LyricUtil.getSyncedLyricsFile(MusicPlayerRemote.currentSong)?.let { binding.lyricsView.loadLrc(it) } 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 915e34116..a4b03a5b1 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 @@ -96,7 +96,7 @@ class UserInfoFragment : Fragment() { binding.next.setOnClickListener { val nameString = binding.name.text.toString().trim { it <= ' ' } if (nameString.isEmpty()) { - showToast("Your name can't be empty!") + showToast(R.string.error_empty_name) return@setOnClickListener } userName = nameString @@ -262,7 +262,7 @@ class UserInfoFragment : Fragment() { } if (successful) { withContext(Dispatchers.Main) { - showToast("Updated") + showToast(R.string.message_updated) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt index 8e09950f3..0b8632826 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt @@ -24,6 +24,7 @@ import androidx.preference.Preference import androidx.preference.PreferenceManager import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat import code.name.monkey.appthemehelper.util.VersionUtils +import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.OnThemeChangedListener import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.preferences.* @@ -37,7 +38,7 @@ import dev.chrisbanes.insetter.applyInsetter abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() { internal fun showProToastAndNavigate(message: String) { - showToast("$message is Pro version feature.") + showToast(getString(R.string.message_pro_feature, message)) NavigationUtil.goToProVersion(requireActivity()) } diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt index ac970fe4c..50869e936 100644 --- a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt +++ b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt @@ -3,6 +3,7 @@ package code.name.monkey.retromusic.helper import android.content.Context import android.os.Environment import code.name.monkey.retromusic.BuildConfig +import code.name.monkey.retromusic.R import code.name.monkey.retromusic.db.PlaylistEntity import code.name.monkey.retromusic.db.toSongEntity import code.name.monkey.retromusic.extensions.showToast @@ -57,11 +58,11 @@ object BackupHelper : KoinComponent { } }.onFailure { withContext(Dispatchers.Main) { - context.showToast("Couldn't create backup") + context.showToast(R.string.error_create_backup) } }.onSuccess { withContext(Dispatchers.Main) { - context.showToast("Backup created successfully") + context.showToast(R.string.message_backup_create_success) } } } @@ -160,7 +161,7 @@ object BackupHelper : KoinComponent { } } withContext(Dispatchers.Main) { - context.showToast("Restore Completed Successfully") + context.showToast(R.string.message_restore_success) } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt index 3fa4aad50..27a70ac67 100644 --- a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt +++ b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt @@ -76,7 +76,7 @@ class LibraryPreferenceDialog : DialogFragment() { private fun updateCategories(categories: List) { if (getSelected(categories) == 0) return if (getSelected(categories) > 5) { - showToast("Not more than 5 items") + showToast(R.string.message_limit_tabs) return } PreferenceUtil.libraryCategory = categories diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt index 39994818f..a4a3ed27e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt +++ b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt @@ -22,6 +22,7 @@ import android.provider.MediaStore import android.widget.Toast import androidx.core.content.edit import code.name.monkey.retromusic.App +import code.name.monkey.retromusic.R import code.name.monkey.retromusic.extensions.showToast import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.model.Artist @@ -56,7 +57,7 @@ class CustomArtistImageUtil private constructor(context: Context) { saveImage(context, artist, it) } .onFailure { - context.showToast("Load Failed") + context.showToast(R.string.error_load_failed) } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 136218a79..be912dd6d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,7 +86,9 @@ Change the sound settings and adjust the equalizer controls Auto Backup and restore your settings, playlists - + + + Backups Biography Just Black @@ -171,9 +173,14 @@ Edit Synced Lyrics Empty Equalizer + Couldn\u2019t create backup + Couldn\u2019t delete backup + Your name can\'t be empty! + Load failed Expanded FAQ Favorites + File already exists Finish last song Fit Flat @@ -237,9 +244,15 @@ Lyrics Made with ❤️ in India Material + MD3 Error Permission error - MD3 + Backup created successfully. + Not more than 5 items + %s is a Pro feature. + Restore completed successfully. + Updated + Welcome to %s]]> Name Most played Never @@ -342,6 +355,7 @@ Can increase the album cover quality, but causes slower image loading times. Only enable this if you have problems with low resolution artworks Configure visibility and order of library categories. Use Retro Music\'s custom lockscreen controls + Always play audio in background regardless of anything else being played License details for open source software When enabled, newly played songs won\'t show in history Navigate to the last used tab on start @@ -354,7 +368,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 - Always play audio in background regardless of anything else being played Show album cover Navigate by Album Artist Album cover theme @@ -387,6 +400,7 @@ Fullscreen controls Keep screen on when showing lyrics Lyrics type + Always play Now playing theme Open source licences Pause history @@ -402,7 +416,6 @@ Volume controls Wallpaper accent color Whitelist music - Always play Pro Black theme, Now playing themes, Carousel effect and more.. Profile