From f8cb506137a3619f828dac94557b5448b2a7fa24 Mon Sep 17 00:00:00 2001
From: AntsyLich <59261191+AntsyLich@users.noreply.github.com>
Date: Sun, 4 May 2025 23:54:02 +0600
Subject: [PATCH] Fix Pill not following the local text style

Closes #2009
---
 CHANGELOG.md                                                   | 1 +
 .../main/java/tachiyomi/presentation/core/components/Pill.kt   | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c69ade9c..b41d8ae79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@ The format is a modified version of [Keep a Changelog](https://keepachangelog.co
 - Fix content under source browse screen top appbar is interactable ([@AntsyLich](https://github.com/AntsyLich)) ([#2026](https://github.com/mihonapp/mihon/pull/2026))
 - Fix crash when trying use source sort filter without a pre-selection ([@AntsyLich](https://github.com/AntsyLich)) ([#2036](https://github.com/mihonapp/mihon/pull/2036))
 - Fix empty layout not appearing in browse source screen in some cases ([@NarwhalHorns](https://github.com/NarwhalHorns)) ([#2043](https://github.com/mihonapp/mihon/pull/2043))
+- Fix Pill not following the local text style ([@AntsyLich](https://github.com/AntsyLich))
 
 ### Removed
 - Remove Okhttp networking from WebView Screen ([@AwkwardPeak7](https://github.com/AwkwardPeak7)) ([#2020](https://github.com/mihonapp/mihon/pull/2020))
diff --git a/presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt
index 4824e1030..dfd07b673 100644
--- a/presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt
+++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/Pill.kt
@@ -51,12 +51,11 @@ fun Pill(
     contentColor: Color = MaterialTheme.colorScheme.onSurface,
     fontSize: TextUnit = LocalTextStyle.current.fontSize,
 ) {
-    val style = LocalTextStyle.current
     Pill(
         text = text,
         modifier = modifier,
         color = color,
         contentColor = contentColor,
-        style = MaterialTheme.typography.bodyMedium.copy(fontSize = fontSize),
+        style = LocalTextStyle.current.merge(fontSize = fontSize),
     )
 }