From 9cbfae5789dab9198e6dc9c790530a4fbaa4976f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Krzy=C5=BCanowski?=
 <filip.krzyzanowski@protonmail.com>
Date: Fri, 6 Nov 2026 07:05:57 +0100
Subject: [PATCH] fix(android): draw picker values in theme font

---
 resources/android/DatePickerRenderer.kt |  2 +-
 resources/android/SelectRenderer.kt     |  2 +-
 tests/PickerFontTest.php                | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 tests/PickerFontTest.php

diff --git a/resources/android/DatePickerRenderer.kt b/resources/android/DatePickerRenderer.kt
index f6911da..967be41 100644
--- a/resources/android/DatePickerRenderer.kt
+++ b/resources/android/DatePickerRenderer.kt
@@ -175,7 +175,7 @@ object DatePickerRenderer {
                             )
                         },
                         modifier = Modifier.fillMaxWidth(),
-                        textStyle = TextStyle(color = theme.onSurface),
+                        textStyle = TextStyle(color = theme.onSurface, fontFamily = nuiDefaultFontFamily()),
                         colors = OutlinedTextFieldDefaults.colors(
                             errorBorderColor = theme.destructive,
                             errorSupportingTextColor = theme.destructive,
diff --git a/resources/android/SelectRenderer.kt b/resources/android/SelectRenderer.kt
index ddaee02..a6b0979 100644
--- a/resources/android/SelectRenderer.kt
+++ b/resources/android/SelectRenderer.kt
@@ -86,7 +86,7 @@ object SelectRenderer {
                 modifier = Modifier
                     .then(if (node.layout?.widthMode == SizeMode.FILL) Modifier.fillMaxWidth() else Modifier)
                     .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable),
-                textStyle = TextStyle(color = theme.onSurface),
+                textStyle = TextStyle(color = theme.onSurface, fontFamily = nuiDefaultFontFamily()),
                 colors = OutlinedTextFieldDefaults.colors(
                     errorBorderColor = theme.destructive,
                     errorLabelColor = theme.destructive,
diff --git a/tests/PickerFontTest.php b/tests/PickerFontTest.php
new file mode 100644
index 0000000..3192025
--- /dev/null
+++ b/tests/PickerFontTest.php
@@ -0,0 +1,12 @@
+<?php
+
+it('draws an Android picker value in the theme font', function (string $file) {
+    $source = file_get_contents(dirname(__DIR__)."/resources/android/{$file}");
+
+    expect($source)
+        ->toContain('textStyle = TextStyle(color = theme.onSurface, fontFamily = nuiDefaultFontFamily())')
+        ->not->toContain('textStyle = TextStyle(color = theme.onSurface),');
+})->with([
+    'DatePickerRenderer.kt',
+    'SelectRenderer.kt',
+]);