From 78f6a343393e6f2dfe0b1ec72541957d45f4d55b 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

(cherry picked from commit f8cb506137a3619f828dac94557b5448b2a7fa24)

# Conflicts:
#	CHANGELOG.md
---
 .../main/java/tachiyomi/presentation/core/components/Pill.kt   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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),
     )
 }