Support log and icon improvements (#3407)

app/src/main/AndroidManifest.xml

@@ -516,7 +516,7 @@
             android:targetActivity=".ui.MainActivity"
             android:enabled="false"
             android:exported="true"
-            android:icon="@mipmap/ic_launcher_pride_2023">
+            android:icon="@mipmap/ic_launcher_pride">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

modules/features/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/viewmodel/SettingsAppearanceViewModel.kt

@@ -101,7 +101,7 @@ class SettingsAppearanceViewModel @Inject constructor(
                     AppIcon.AppIconType.PATRON_ROUND -> "patron_round"
                     AppIcon.AppIconType.PATRON_GLOW -> "patron_glow"
                     AppIcon.AppIconType.PATRON_DARK -> "patron_dark"
-                    AppIcon.AppIconType.PRIDE_2023 -> "pride_2023"
+                    AppIcon.AppIconType.PRIDE -> "pride_2023"
                 },
             ),
         )

modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_pride_2023.xml → modules/services/images/src/main/res/mipmap-anydpi-v26/ic_launcher_pride.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_pride_2023_background"/>
-  <foreground android:drawable="@mipmap/ic_launcher_pride_2023_foreground"/>
+  <background android:drawable="@mipmap/ic_launcher_pride_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_pride_foreground"/>
   <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>

modules/services/localization/src/main/res/values/strings.xml

@@ -1513,7 +1513,7 @@
     <string name="settings_app_icon_rose" translatable="false">@string/settings_theme_rose</string>
     <string name="settings_app_icon_pocket_cats" translatable="false">Pocket Cats</string>
     <string name="settings_app_icon_red_velvet">Red Velvet</string>
-    <string name="settings_app_icon_pride_2023">Pride 2023</string>
+    <string name="settings_app_icon_pride">Pride</string>
     <string name="settings_app_icon_plus">Plus</string>
     <string name="settings_app_icon_classic" translatable="false">@string/settings_theme_classic</string>
     <string name="settings_app_icon_electric_blue">Electric Blue</string>

modules/services/preferences/src/main/java/au/com/shiftyjelly/pocketcasts/preferences/model/AppIconSetting.kt

@@ -9,7 +9,7 @@ enum class AppIconSetting(val id: String) {
     ROSE("rose"),
     CAT("cat"),
     REDVELVET("redvelvet"),
-    PRIDE_2023("pride_2023"),
+    PRIDE("pride_2023"), // Leave the 2023 in the setting value so existing users don't lose their icon
     PLUS("plus"),
     CLASSIC("classic"),
     ELECTRIC_BLUE("electricBlue"),

modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/support/Support.kt

@@ -229,7 +229,7 @@ class Support @Inject constructor(
             output.append(eol)
 
             output.append("Background refresh: ").append(settings.backgroundRefreshPodcasts.value).append(eol)
-            output.append("Battery restriction: ${systemBatteryRestrictions.status}")
+            output.append("Battery restriction: ${systemBatteryRestrictions.status}").append(eol)
             output.append(eol)
 
             if (Build.VERSION.SDK_INT >= 30) {
@@ -248,7 +248,7 @@ class Support @Inject constructor(
 
             val features = Feature.entries.map { "${it.key}: ${FeatureFlag.isEnabled(it)}" }
             output.append("Feature flags").append(eol)
-            features.forEach { output.append(it).append(eol) }
+            features.forEach { output.append("  ").append(it).append(eol) }
 
             val podcastsOutput = StringBuilder()
             podcastsOutput.append("Podcasts").append(eol).append("--------").append(eol).append(eol)
@@ -264,8 +264,11 @@ class Support @Inject constructor(
                     podcastsOutput.append(if (podcast.title.isEmpty()) "-" else podcast.title).append(eol)
                     podcastsOutput.append("Last episode: ").append(podcast.latestEpisodeUuid).append(eol)
                     val effects = podcast.playbackEffects
-                    podcastsOutput.append("Audio effects: ").append(if (podcast.overrideGlobalEffects) "on" else "off").append(" Silence removed: ").append(effects.trimMode).append(" Speed: ").append(effects.playbackSpeed).append(" Boost: ")
-                        .append(if (effects.isVolumeBoosted) "on" else "off").append(eol)
+                    podcastsOutput.append("Audio effects: ").append(if (podcast.overrideGlobalEffects) "on" else "off")
+                        .append(" Silence removed: ").append(effects.trimMode.toString().lowercase())
+                        .append(" Speed: ").append(effects.playbackSpeed)
+                        .append(" Boost: ").append(if (effects.isVolumeBoosted) "on" else "off")
+                        .append(eol)
                     podcastsOutput.append("Auto download? ").append(podcast.isAutoDownloadNewEpisodes).append(eol)
                     podcastsOutput.append("Custom auto archive: ").append(podcast.overrideGlobalArchive.toString()).append(eol)
                     if (podcast.overrideGlobalArchive) {
@@ -284,16 +287,16 @@ class Support @Inject constructor(
 
             output.append(eol)
             output.append("Auto archive settings").append(eol)
-            output.append("Auto archive played episodes after: ${settings.autoArchiveAfterPlaying.value.analyticsValue}").append(eol)
-            output.append("Auto archive inactive episodes after: ${settings.autoArchiveInactive.value.analyticsValue}").append(eol)
-            output.append("Auto archive starred episodes: ${settings.autoArchiveIncludesStarred.value}").append(eol)
+            output.append("  Auto archive played episodes after: ${settings.autoArchiveAfterPlaying.value.analyticsValue}").append(eol)
+            output.append("  Auto archive inactive episodes after: ${settings.autoArchiveInactive.value.analyticsValue}").append(eol)
+            output.append("  Auto archive starred episodes: ${settings.autoArchiveIncludesStarred.value}").append(eol)
 
             output.append(eol)
             output.append("Auto downloads").append(eol)
             output.append("  Any podcast? ").append(yesNoString(autoDownloadOn[0])).append(eol)
-            output.append("  New Episodes? ").append(yesNoString(settings.autoDownloadNewEpisodes.value == AUTO_DOWNLOAD_NEW_EPISODES)).append(eol)
-            output.append("  On Follow? ").append(yesNoString(settings.autoDownloadOnFollowPodcast.value)).append(eol)
-            output.append("  Limit Downloads ").append(settings.autoDownloadLimit.value).append(eol)
+            output.append("  New episodes? ").append(yesNoString(settings.autoDownloadNewEpisodes.value == AUTO_DOWNLOAD_NEW_EPISODES)).append(eol)
+            output.append("  On follow? ").append(yesNoString(settings.autoDownloadOnFollowPodcast.value)).append(eol)
+            output.append("  Limit downloads: ").append(settings.autoDownloadLimit.value).append(eol)
             output.append("  Up Next? ").append(yesNoString(settings.autoDownloadUpNext.value)).append(eol)
             output.append("  Only on unmetered WiFi? ").append(yesNoString(settings.autoDownloadUnmeteredOnly.value)).append(eol)
             output.append("  Only when charging? ").append(yesNoString(settings.autoDownloadOnlyWhenCharging.value)).append(eol)
@@ -392,7 +395,7 @@ class Support @Inject constructor(
                 output.append("Effects").append(eol)
                 output.append("Global Audio effects: ")
                     .append(" Playback speed: ").append(effects.playbackSpeed).append(eol)
-                    .append(" Silence removed: ").append(effects.trimMode).append(eol)
+                    .append(" Silence removed: ").append(effects.trimMode.toString().lowercase()).append(eol)
                     .append(" Volume boost: ").append(if (effects.isVolumeBoosted) "on" else "off").append(eol).append(eol)
 
                 output.append("Database").append(eol)

modules/services/ui/src/main/java/au/com/shiftyjelly/pocketcasts/ui/helper/AppIcon.kt

@@ -95,12 +95,12 @@ class AppIcon @Inject constructor(
             launcherIcon = IR.mipmap.ic_launcher_redvelvet,
             aliasName = ".ui.MainActivity_11",
         ),
-        PRIDE_2023(
-            setting = AppIconSetting.PRIDE_2023,
-            labelId = LR.string.settings_app_icon_pride_2023,
-            settingsIcon = IR.drawable.appicon_pride_2023,
+        PRIDE(
+            setting = AppIconSetting.PRIDE,
+            labelId = LR.string.settings_app_icon_pride,
+            settingsIcon = IR.drawable.appicon_pride,
             tier = SubscriptionTier.NONE,
-            launcherIcon = IR.mipmap.ic_launcher_pride_2023,
+            launcherIcon = IR.mipmap.ic_launcher_pride,
             aliasName = ".ui.MainActivity_18",
         ),
         PLUS(
@@ -195,7 +195,7 @@ class AppIcon @Inject constructor(
                 AppIconSetting.ROSE -> ROSE
                 AppIconSetting.CAT -> CAT
                 AppIconSetting.REDVELVET -> REDVELVET
-                AppIconSetting.PRIDE_2023 -> PRIDE_2023
+                AppIconSetting.PRIDE -> PRIDE
                 AppIconSetting.PLUS -> PLUS
                 AppIconSetting.CLASSIC -> CLASSIC
                 AppIconSetting.ELECTRIC_BLUE -> ELECTRIC_BLUE