Merge/release 7.45 to main (#1294)

Co-authored-by: Matt Chowning <[email protected]>
Automattic · Aug 21, 2023 · e6b8349 · e6b8349
1 parent 98a054a
commit e6b8349
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...sts/src/main/java/au/com/shiftyjelly/pocketcasts/podcasts/view/episode/EpisodeFragment.kt b/...sts/src/main/java/au/com/shiftyjelly/pocketcasts/podcasts/view/episode/EpisodeFragment.kt
@@ -139,13 +139,16 @@ class EpisodeFragment : BaseFragment() {
         get() = if (forceDarkTheme && theme.isLightTheme) Theme.ThemeType.DARK else theme.activeTheme
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        binding = FragmentEpisodeBinding.inflate(inflater, container, false)
-        showNotesFormatter = if (!forceDarkTheme || theme.isDarkTheme) {
-            createShowNotesFormatter(requireContext())
+        val themeResId = if (!forceDarkTheme || theme.isDarkTheme) {
+            activeTheme.resourceId
         } else {
-            val context = ContextThemeWrapper(requireContext(), R.style.ThemeDark)
-            createShowNotesFormatter(context)
+            R.style.ThemeDark
         }
+        val contextThemeWrapper = ContextThemeWrapper(requireContext(), themeResId)
+        val localInflater = inflater.cloneInContext(contextThemeWrapper)
+        binding = FragmentEpisodeBinding.inflate(localInflater, container, false)
+
+        showNotesFormatter = createShowNotesFormatter(contextThemeWrapper)
 
         statusBarColor = StatusBarColor.Custom(
             context?.getThemeColor(R.attr.primary_ui_01) ?: Color.WHITE, theme.isDarkTheme

diff --git a/version.properties b/version.properties
@@ -1,3 +1,3 @@
 # Version Information for Vanilla / Release builds
 versionName=7.45
-versionCode=9124
+versionCode=9128