diff --git a/CHANGELOG.md b/CHANGELOG.md index 725646a000e..4b99a57be9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ * New Features: * Wear OS app ([#1068](https://github.com/Automattic/pocket-casts-android/pull/1068)). + * Updates + Use regular Pocket Casts app icon by default, and allow pride icon to still be selected. + ([#1079](https://github.com/Automattic/pocket-casts-android/pull/1079)). 7.40 ----- diff --git a/app/build.gradle b/app/build.gradle index 68a7381266f..32f9b629840 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,7 +48,7 @@ android { release { manifestPlaceholders = [ - appIcon: "@mipmap/ic_launcher_pride_2023", + appIcon: "@mipmap/ic_launcher", gitHash: "", sentryDsn: project.pocketcastsSentryDsn ] 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 40421f45541..acf5a543d76 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 @@ -179,7 +179,7 @@ class AppIcon @Inject constructor( ); companion object { - fun fromString(value: String, default: AppIconType = PRIDE_2023): AppIconType { + fun fromString(value: String, default: AppIconType = DEFAULT): AppIconType { return AppIconType.values().find { it.id == value } ?: default } } @@ -194,8 +194,8 @@ class AppIcon @Inject constructor( val allAppIconTypes = AppIconType.values() private fun getAppIconFromPreferences(): AppIconType { - val appIconId: String = sharedPreferences.getString(PREFERENCE_APPICON, AppIconType.PRIDE_2023.id) ?: AppIconType.PRIDE_2023.id - return AppIconType.fromString(appIconId, AppIconType.PRIDE_2023) + val appIconId: String = sharedPreferences.getString(PREFERENCE_APPICON, AppIconType.DEFAULT.id) ?: AppIconType.PRIDE_2023.id + return AppIconType.fromString(appIconId, AppIconType.DEFAULT) } private fun setAppIconToPreferences(appIconType: AppIconType) { @@ -210,7 +210,7 @@ class AppIcon @Inject constructor( AppIconType.values().forEach { iconType -> val componentName = ComponentName(componentPackage, "$classPath${iconType.aliasName}") // If we are using the default icon we just switch every alias off - val enabledFlag = if (selectedIconType == iconType && selectedIconType != AppIconType.PRIDE_2023) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED + val enabledFlag = if (selectedIconType == iconType && selectedIconType != AppIconType.DEFAULT) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED context.packageManager.setComponentEnabledSetting(componentName, enabledFlag, PackageManager.DONT_KILL_APP) } }