diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt index 76abc0c6d..da012c989 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt @@ -9,6 +9,7 @@ import android.os.Environment import androidx.core.app.ActivityCompat import androidx.fragment.app.DialogFragment import code.name.monkey.retromusic.R +import code.name.monkey.retromusic.extensions.materialDialog import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.list.listItems import com.afollestad.materialdialogs.list.updateListItems @@ -61,7 +62,7 @@ class BlacklistFolderChooserDialog : DialogFragment() { ) != PackageManager.PERMISSION_GRANTED ) { - return MaterialDialog(requireActivity()).show { + return materialDialog().show { title(res = R.string.md_error_label) message(res = R.string.md_storage_perm_error) positiveButton(res = android.R.string.ok) @@ -76,7 +77,7 @@ class BlacklistFolderChooserDialog : DialogFragment() { parentFolder = File(mSavedInstanceState.getString("current_path", File.pathSeparator)) checkIfCanGoUp() parentContents = listFiles() - return MaterialDialog(requireContext()) + return materialDialog() .title(text = parentFolder!!.absolutePath) .listItems( items = contentsArray.toCharSequence(), @@ -85,7 +86,6 @@ class BlacklistFolderChooserDialog : DialogFragment() { onSelection(i) } .noAutoDismiss() - .cornerRadius(literalDp = 20F) .positiveButton(res = R.string.add_action) { callback!!.onFolderSelection(this@BlacklistFolderChooserDialog, parentFolder!!) dismiss() diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt index 3cc867b7c..8aa52fbd2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt @@ -26,13 +26,13 @@ import code.name.monkey.retromusic.EXTRA_SONG import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.saf.SAFGuideActivity import code.name.monkey.retromusic.extensions.extraNotNull +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.fragments.LibraryViewModel import code.name.monkey.retromusic.fragments.ReloadType import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.SAFUtil -import com.afollestad.materialdialogs.MaterialDialog import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -83,11 +83,10 @@ class DeleteSongsDialog : DialogFragment() { ) } - return MaterialDialog(requireContext()) + return materialDialog() .title(pair.first) .message(text = pair.second) .noAutoDismiss() - .cornerRadius(16F) .negativeButton(android.R.string.cancel) { dismiss() } diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt index 52449db17..95c99033e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt @@ -16,6 +16,7 @@ package code.name.monkey.retromusic.extensions import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment +import androidx.fragment.app.Fragment import code.name.monkey.retromusic.R import com.afollestad.materialdialogs.MaterialDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -35,3 +36,8 @@ fun AlertDialog.colorButtons(): AlertDialog { } return this } + +fun Fragment.materialDialog(): MaterialDialog { + return MaterialDialog(requireContext()) + .cornerRadius(res = R.dimen.m3_alert_dialog_corner_size) +} 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 efa11bcd6..657839648 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 @@ -19,10 +19,10 @@ import code.name.monkey.retromusic.adapter.backup.BackupAdapter import code.name.monkey.retromusic.databinding.FragmentBackupBinding import code.name.monkey.retromusic.extensions.accentColor import code.name.monkey.retromusic.extensions.accentOutlineColor +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.helper.BackupHelper import code.name.monkey.retromusic.helper.sanitize import code.name.monkey.retromusic.util.BackupUtil -import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.input.input import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -92,8 +92,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC @SuppressLint("CheckResult") private fun showCreateBackupDialog() { - MaterialDialog(requireContext()).show { - cornerRadius(res = R.dimen.m3_card_corner_radius) + materialDialog().show { title(res = R.string.action_rename) input(prefill = BackupHelper.getTimeStamp()) { _, text -> // Text submitted with the action button @@ -142,7 +141,7 @@ class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupC return true } R.id.action_rename -> { - MaterialDialog(requireContext()).show { + materialDialog().show { title(res = R.string.action_rename) input(prefill = file.nameWithoutExtension) { _, text -> // Text submitted with the action button 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 3d3315cc2..532394eac 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 @@ -41,6 +41,7 @@ import code.name.monkey.retromusic.databinding.FragmentLyricsBinding import code.name.monkey.retromusic.databinding.FragmentNormalLyricsBinding import code.name.monkey.retromusic.databinding.FragmentSyncedLyricsBinding import code.name.monkey.retromusic.extensions.accentColor +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.extensions.textColorSecondary import code.name.monkey.retromusic.extensions.uri import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment @@ -50,7 +51,6 @@ import code.name.monkey.retromusic.lyrics.LrcView import code.name.monkey.retromusic.model.AudioTagInfo import code.name.monkey.retromusic.model.Song import code.name.monkey.retromusic.util.* -import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.input.input import com.google.android.material.color.MaterialColors import com.google.android.material.tabs.TabLayoutMediator @@ -239,7 +239,7 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { e.printStackTrace() } - MaterialDialog(requireContext()).show { + materialDialog().show { title(res = R.string.edit_normal_lyrics) input( hintRes = R.string.paste_lyrics_here, @@ -286,7 +286,7 @@ class LyricsFragment : AbsMusicServiceFragment(R.layout.fragment_lyrics) { private fun editSyncedLyrics() { val content: String = LyricUtil.getStringFromLrc(LyricUtil.getSyncedLyricsFile(song)) - MaterialDialog(requireContext()).show { + materialDialog().show { title(res = R.string.edit_synced_lyrics) input( hintRes = R.string.paste_timeframe_lyrics_here, diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt index 0e47a341a..cf81a339a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt @@ -28,8 +28,8 @@ import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.* import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager +import code.name.monkey.retromusic.extensions.materialDialog import code.name.monkey.retromusic.util.PreferenceUtil -import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.color.colorChooser import com.google.android.material.color.DynamicColors @@ -61,7 +61,7 @@ class ThemeSettingsFragment : AbsSettingsFragment() { val accentColor = ThemeStore.accentColor(requireContext()) accentColorPref?.setColor(accentColor, ColorUtil.darkenColor(accentColor)) accentColorPref?.setOnPreferenceClickListener { - MaterialDialog(requireContext()).show { + materialDialog().show { colorChooser( initialSelection = accentColor, showAlphaSelector = false,