diff --git a/CHANGELOG.md b/CHANGELOG.md index 66c18ce9e32..a9bb88ac5d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ 7.26 ----- +* New Features: + * Added a Halloween icon. + ([#415](https://github.com/Automattic/pocket-casts-android/pull/415)). 7.25 ----- diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 95a30f7187b..c3dc39786e7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -400,6 +400,18 @@ + + + + + + diff --git a/modules/features/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/AppearanceIconSettingsAdapter.kt b/modules/features/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/AppearanceIconSettingsAdapter.kt index 863ac53d06f..3314d663d20 100644 --- a/modules/features/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/AppearanceIconSettingsAdapter.kt +++ b/modules/features/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/AppearanceIconSettingsAdapter.kt @@ -85,7 +85,7 @@ class AppearanceIconSettingsAdapter( val showOption = !appIcon.isPlus || isPlusSignedIn binding.appIconItem.alpha = if (showOption) 1.0f else 0.65f - val drawable = AppCompatResources.getDrawable(itemView.context, appIcon.resourceId) + val drawable = AppCompatResources.getDrawable(itemView.context, appIcon.settingsIcon) binding.imgIcon.setImageDrawable(drawable) var tickDrawable: Drawable? = null if (showOption && selected) { diff --git a/modules/services/images/src/main/res/drawable-hdpi/appicon_halloween.png b/modules/services/images/src/main/res/drawable-hdpi/appicon_halloween.png new file mode 100644 index 00000000000..5be2e5010c3 Binary files /dev/null and b/modules/services/images/src/main/res/drawable-hdpi/appicon_halloween.png differ diff --git a/modules/services/images/src/main/res/drawable-hdpi/appicon_radioactive.png b/modules/services/images/src/main/res/drawable-hdpi/appicon_radioactive.png new file mode 100644 index 00000000000..e4a884aad1e Binary files /dev/null and b/modules/services/images/src/main/res/drawable-hdpi/appicon_radioactive.png differ diff --git a/modules/services/images/src/main/res/drawable-hdpi/appicon_red_velvet.png b/modules/services/images/src/main/res/drawable-hdpi/appicon_red_velvet.png new file mode 100644 index 00000000000..72ad64d363f Binary files /dev/null and b/modules/services/images/src/main/res/drawable-hdpi/appicon_red_velvet.png differ diff --git a/modules/services/images/src/main/res/drawable-mdpi/appicon_halloween.png b/modules/services/images/src/main/res/drawable-mdpi/appicon_halloween.png new file mode 100644 index 00000000000..a7178271b5b Binary files /dev/null and b/modules/services/images/src/main/res/drawable-mdpi/appicon_halloween.png differ diff --git a/modules/services/images/src/main/res/drawable-mdpi/appicon_radioactive.png b/modules/services/images/src/main/res/drawable-mdpi/appicon_radioactive.png index 766c051c30e..1cf25f251d6 100644 Binary files a/modules/services/images/src/main/res/drawable-mdpi/appicon_radioactive.png and b/modules/services/images/src/main/res/drawable-mdpi/appicon_radioactive.png differ diff --git a/modules/services/images/src/main/res/drawable-mdpi/appicon_red_velvet.png b/modules/services/images/src/main/res/drawable-mdpi/appicon_red_velvet.png index 8bf1989ada7..05d42f49bdc 100644 Binary files a/modules/services/images/src/main/res/drawable-mdpi/appicon_red_velvet.png and b/modules/services/images/src/main/res/drawable-mdpi/appicon_red_velvet.png differ diff --git a/modules/services/images/src/main/res/drawable-xhdpi/appicon_halloween.png b/modules/services/images/src/main/res/drawable-xhdpi/appicon_halloween.png new file mode 100644 index 00000000000..aeca9d62e9a Binary files /dev/null and b/modules/services/images/src/main/res/drawable-xhdpi/appicon_halloween.png differ diff --git a/modules/services/images/src/main/res/drawable-xhdpi/appicon_radioactive.png b/modules/services/images/src/main/res/drawable-xhdpi/appicon_radioactive.png index d7612fb0230..37bb0080706 100644 Binary files a/modules/services/images/src/main/res/drawable-xhdpi/appicon_radioactive.png and b/modules/services/images/src/main/res/drawable-xhdpi/appicon_radioactive.png differ diff --git a/modules/services/images/src/main/res/drawable-xhdpi/appicon_red_velvet.png b/modules/services/images/src/main/res/drawable-xhdpi/appicon_red_velvet.png index 7ad5b422a47..c03f5cecae8 100644 Binary files a/modules/services/images/src/main/res/drawable-xhdpi/appicon_red_velvet.png and b/modules/services/images/src/main/res/drawable-xhdpi/appicon_red_velvet.png differ diff --git a/modules/services/images/src/main/res/drawable-xxhdpi/appicon_halloween.png b/modules/services/images/src/main/res/drawable-xxhdpi/appicon_halloween.png new file mode 100644 index 00000000000..f3847e4d45a Binary files /dev/null and b/modules/services/images/src/main/res/drawable-xxhdpi/appicon_halloween.png differ diff --git a/modules/services/images/src/main/res/drawable-xxhdpi/appicon_radioactive.png b/modules/services/images/src/main/res/drawable-xxhdpi/appicon_radioactive.png index e763f0c6eb0..5ba77142b26 100644 Binary files a/modules/services/images/src/main/res/drawable-xxhdpi/appicon_radioactive.png and b/modules/services/images/src/main/res/drawable-xxhdpi/appicon_radioactive.png differ diff --git a/modules/services/images/src/main/res/drawable-xxhdpi/appicon_red_velvet.png b/modules/services/images/src/main/res/drawable-xxhdpi/appicon_red_velvet.png index 9bd7829a751..ebded7be751 100644 Binary files a/modules/services/images/src/main/res/drawable-xxhdpi/appicon_red_velvet.png and b/modules/services/images/src/main/res/drawable-xxhdpi/appicon_red_velvet.png differ diff --git a/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_halloween.png b/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_halloween.png new file mode 100644 index 00000000000..51bf262353a Binary files /dev/null and b/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_halloween.png differ diff --git a/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_radioactive.png b/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_radioactive.png new file mode 100644 index 00000000000..9126102de10 Binary files /dev/null and b/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_radioactive.png differ diff --git a/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_red_velvet.png b/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_red_velvet.png new file mode 100644 index 00000000000..6d3e08a4ba8 Binary files /dev/null and b/modules/services/images/src/main/res/drawable-xxxhdpi/appicon_red_velvet.png differ diff --git a/modules/services/images/src/main/res/drawable/ic_launcher_halloween_monochrome.xml b/modules/services/images/src/main/res/drawable/ic_launcher_halloween_monochrome.xml new file mode 100644 index 00000000000..0676f8cb67f --- /dev/null +++ b/modules/services/images/src/main/res/drawable/ic_launcher_halloween_monochrome.xml @@ -0,0 +1,13 @@ + + + + diff --git a/modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_halloween.xml b/modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_halloween.xml new file mode 100644 index 00000000000..296ea6df367 --- /dev/null +++ b/modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_halloween.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_halloween_round.xml b/modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_halloween_round.xml new file mode 100644 index 00000000000..eec02236f24 --- /dev/null +++ b/modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_halloween_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween.png b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween.png new file mode 100644 index 00000000000..5fb03f24c02 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween.png differ diff --git a/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_background.png b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_background.png new file mode 100644 index 00000000000..864bc02b162 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_background.png differ diff --git a/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_foreground.png b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_foreground.png new file mode 100644 index 00000000000..1a3c51cf33a Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_foreground.png differ diff --git a/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_round.png b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_round.png new file mode 100644 index 00000000000..869f8c7eb8b Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-hdpi/ic_launcher_halloween_round.png differ diff --git a/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween.png b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween.png new file mode 100644 index 00000000000..3713cb4f4e6 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween.png differ diff --git a/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_background.png b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_background.png new file mode 100644 index 00000000000..234e38989e4 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_background.png differ diff --git a/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_foreground.png b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_foreground.png new file mode 100644 index 00000000000..7fe1869778a Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_foreground.png differ diff --git a/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_round.png b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_round.png new file mode 100644 index 00000000000..fe78de405d1 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-mdpi/ic_launcher_halloween_round.png differ diff --git a/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween.png b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween.png new file mode 100644 index 00000000000..53066f25bc4 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween.png differ diff --git a/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_background.png b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_background.png new file mode 100644 index 00000000000..ae341c35bbd Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_background.png differ diff --git a/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_foreground.png b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_foreground.png new file mode 100644 index 00000000000..f904e14fd89 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_foreground.png differ diff --git a/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_round.png b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_round.png new file mode 100644 index 00000000000..eaab5ef6fbf Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xhdpi/ic_launcher_halloween_round.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween.png b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween.png new file mode 100644 index 00000000000..f8d6875427f Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_background.png b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_background.png new file mode 100644 index 00000000000..cb84c82a301 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_background.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_foreground.png b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_foreground.png new file mode 100644 index 00000000000..fdbb99d08dc Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_foreground.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_round.png b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_round.png new file mode 100644 index 00000000000..49c39ae9aa8 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxhdpi/ic_launcher_halloween_round.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween.png b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween.png new file mode 100644 index 00000000000..db0cb87878a Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_background.png b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_background.png new file mode 100644 index 00000000000..1db5b47e3cd Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_background.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_foreground.png b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_foreground.png new file mode 100644 index 00000000000..a164781ec90 Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_foreground.png differ diff --git a/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_round.png b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_round.png new file mode 100644 index 00000000000..3c6d7eb2d5e Binary files /dev/null and b/modules/services/images/src/main/res/mipmap-xxxhdpi/ic_launcher_halloween_round.png differ diff --git a/modules/services/localization/src/main/res/values/strings.xml b/modules/services/localization/src/main/res/values/strings.xml index ee06bf85187..bd50f74f81e 100644 --- a/modules/services/localization/src/main/res/values/strings.xml +++ b/modules/services/localization/src/main/res/values/strings.xml @@ -1182,6 +1182,7 @@ Electric Blue Electric Pink @string/settings_theme_radioactivity + Halloween Please wait just a moment while we collect details to help our support team Unable to email Please check you have an email app installed. diff --git a/modules/services/ui/src/main/java/au/com/shiftyjelly/pocketcasts/ui/helper/AppIcon.kt b/modules/services/ui/src/main/java/au/com/shiftyjelly/pocketcasts/ui/helper/AppIcon.kt index 2a37ba27870..73a0a95dbe1 100644 --- a/modules/services/ui/src/main/java/au/com/shiftyjelly/pocketcasts/ui/helper/AppIcon.kt +++ b/modules/services/ui/src/main/java/au/com/shiftyjelly/pocketcasts/ui/helper/AppIcon.kt @@ -23,11 +23,11 @@ class AppIcon @Inject constructor( @PublicSharedPreferences private val sharedPreferences: SharedPreferences ) { - enum class AppIconType(val id: String, @StringRes val labelId: Int, @DrawableRes val resourceId: Int, val isPlus: Boolean, @DrawableRes val launcherIcon: Int, val aliasName: String) { + enum class AppIconType(val id: String, @StringRes val labelId: Int, @DrawableRes val settingsIcon: Int, val isPlus: Boolean, @DrawableRes val launcherIcon: Int, val aliasName: String) { DEFAULT( id = "default", labelId = LR.string.settings_app_icon_default, - resourceId = IR.drawable.ic_appicon0, + settingsIcon = IR.drawable.ic_appicon0, isPlus = false, launcherIcon = IR.mipmap.ic_launcher, aliasName = ".ui.MainActivity_0" @@ -35,7 +35,7 @@ class AppIcon @Inject constructor( DARK( id = "dark", labelId = LR.string.settings_app_icon_dark, - resourceId = IR.drawable.ic_appicon1, + settingsIcon = IR.drawable.ic_appicon1, isPlus = false, launcherIcon = IR.mipmap.ic_launcher_1, aliasName = ".ui.MainActivity_1" @@ -43,7 +43,7 @@ class AppIcon @Inject constructor( ROUND_LIGHT( id = "roundedLight", labelId = LR.string.settings_app_icon_round_light, - resourceId = IR.drawable.ic_appicon2, + settingsIcon = IR.drawable.ic_appicon2, isPlus = false, launcherIcon = IR.mipmap.ic_launcher_2, aliasName = ".ui.MainActivity_2" @@ -51,7 +51,7 @@ class AppIcon @Inject constructor( ROUND_DARK( id = "roundedDark", labelId = LR.string.settings_app_icon_round_dark, - resourceId = IR.drawable.ic_appicon3, + settingsIcon = IR.drawable.ic_appicon3, isPlus = false, launcherIcon = IR.mipmap.ic_launcher_3, aliasName = ".ui.MainActivity_3" @@ -59,7 +59,7 @@ class AppIcon @Inject constructor( INDIGO( id = "indigo", labelId = LR.string.settings_app_icon_indigo, - resourceId = IR.drawable.ic_appicon_indigo, + settingsIcon = IR.drawable.ic_appicon_indigo, isPlus = false, launcherIcon = IR.mipmap.ic_launcher_indigo, aliasName = ".ui.MainActivity_9" @@ -67,7 +67,7 @@ class AppIcon @Inject constructor( ROSE( id = "rose", labelId = LR.string.settings_app_icon_rose, - resourceId = IR.drawable.appicon_rose, + settingsIcon = IR.drawable.appicon_rose, isPlus = false, launcherIcon = IR.mipmap.ic_launcher_rose, aliasName = ".ui.MainActivity_12" @@ -75,7 +75,7 @@ class AppIcon @Inject constructor( CAT( id = "cat", labelId = LR.string.settings_app_icon_pocket_cats, - resourceId = IR.drawable.ic_appicon_pocket_cats, + settingsIcon = IR.drawable.ic_appicon_pocket_cats, isPlus = false, launcherIcon = IR.mipmap.ic_launcher_cat, aliasName = ".ui.MainActivity_10" @@ -83,7 +83,7 @@ class AppIcon @Inject constructor( REDVELVET( id = "redvelvet", labelId = LR.string.settings_app_icon_red_velvet, - resourceId = IR.drawable.appicon_red_velvet, + settingsIcon = IR.drawable.appicon_red_velvet, isPlus = false, launcherIcon = IR.mipmap.ic_launcher_redvelvet, aliasName = ".ui.MainActivity_11" @@ -91,7 +91,7 @@ class AppIcon @Inject constructor( PLUS( id = "plus", labelId = LR.string.settings_app_icon_plus, - resourceId = IR.drawable.ic_appicon4, + settingsIcon = IR.drawable.ic_appicon4, isPlus = true, launcherIcon = IR.mipmap.ic_launcher_4, aliasName = ".ui.MainActivity_4" @@ -99,7 +99,7 @@ class AppIcon @Inject constructor( CLASSIC( id = "classic", labelId = LR.string.settings_app_icon_classic, - resourceId = IR.drawable.ic_appicon5, + settingsIcon = IR.drawable.ic_appicon5, isPlus = true, launcherIcon = IR.mipmap.ic_launcher_5, aliasName = ".ui.MainActivity_5" @@ -107,7 +107,7 @@ class AppIcon @Inject constructor( ELECTRIC_BLUE( id = "electricBlue", labelId = LR.string.settings_app_icon_electric_blue, - resourceId = IR.drawable.ic_appicon6, + settingsIcon = IR.drawable.ic_appicon6, isPlus = true, launcherIcon = IR.mipmap.ic_launcher_6, aliasName = ".ui.MainActivity_6" @@ -115,7 +115,7 @@ class AppIcon @Inject constructor( ELECTRIC_PINK( id = "electricPink", labelId = LR.string.settings_app_icon_electric_pink, - resourceId = IR.drawable.ic_appicon7, + settingsIcon = IR.drawable.ic_appicon7, isPlus = true, launcherIcon = IR.mipmap.ic_launcher_7, aliasName = ".ui.MainActivity_7" @@ -123,10 +123,18 @@ class AppIcon @Inject constructor( RADIOACTIVE( id = "radioactive", labelId = LR.string.settings_app_icon_radioactivity, - resourceId = IR.drawable.appicon_radioactive, + settingsIcon = IR.drawable.appicon_radioactive, isPlus = true, launcherIcon = IR.mipmap.ic_launcher_radioactive, aliasName = ".ui.MainActivity_8" + ), + HALLOWEEN( + id = "halloween", + labelId = LR.string.settings_app_icon_halloween, + settingsIcon = IR.drawable.appicon_halloween, + isPlus = true, + launcherIcon = IR.mipmap.ic_launcher_halloween, + aliasName = ".ui.MainActivity_13" ); companion object { diff --git a/modules/services/views/src/main/java/au/com/shiftyjelly/pocketcasts/views/dialog/ConfirmationDialog.kt b/modules/services/views/src/main/java/au/com/shiftyjelly/pocketcasts/views/dialog/ConfirmationDialog.kt index 921d3a06cc3..306b3c0fb0a 100644 --- a/modules/services/views/src/main/java/au/com/shiftyjelly/pocketcasts/views/dialog/ConfirmationDialog.kt +++ b/modules/services/views/src/main/java/au/com/shiftyjelly/pocketcasts/views/dialog/ConfirmationDialog.kt @@ -38,8 +38,8 @@ open class ConfirmationDialog : BottomSheetDialogFragment() { private var title: String? = null private var summary: String? = null @DrawableRes private var iconId: Int = 0 - private lateinit var buttonType: ConfirmationDialog.ButtonType - var secondaryType: ConfirmationDialog.ButtonType? = null + private lateinit var buttonType: ButtonType + var secondaryType: ButtonType? = null @AttrRes private var iconTintAttr: Int? = UR.attr.primary_icon_01 private var onConfirm: (() -> Unit)? = null private var onSecondary: (() -> Unit)? = null @@ -56,13 +56,13 @@ open class ConfirmationDialog : BottomSheetDialogFragment() { null } else if (episodeCount in 5..Settings.MAX_DOWNLOAD) { ConfirmationDialog() - .setButtonType(ConfirmationDialog.ButtonType.Normal(resources.getString(LR.string.download_warning_button, episodeCount))) + .setButtonType(ButtonType.Normal(resources.getString(LR.string.download_warning_button, episodeCount))) .setIconId(IR.drawable.ic_download) .setTitle(resources.getString(LR.string.download_warning_title)) .setOnConfirm(onConfirm) } else { ConfirmationDialog() - .setButtonType(ConfirmationDialog.ButtonType.Normal(resources.getString(LR.string.download_warning_button, Settings.MAX_DOWNLOAD))) + .setButtonType(ButtonType.Normal(resources.getString(LR.string.download_warning_button, Settings.MAX_DOWNLOAD))) .setIconId(IR.drawable.ic_download) .setTitle(resources.getString(LR.string.download_warning_title)) .setSummary(resources.getString(LR.string.download_warning_limit_summary, Settings.MAX_DOWNLOAD))