Skip to content

Un-strip ui-text-android and ui-unit-android Compose bindings #1440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpeppers merged 3 commits into from
Jun 5, 2026
Merged

Un-strip ui-text-android and ui-unit-android Compose bindings #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cf8e0f
Initial plan
Copilot Jun 4, 2026
1659cd0
Un-strip ui-text-android and ui-unit-android bindings
Copilot Jun 4, 2026
4c5bb5e
Resolve Dp inline-class method collisions in foundation-layout-android
Copilot Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,14 +556,14 @@
"groupId": "androidx.compose.ui",
"artifactId": "ui-text",
"version": "1.11.2",
"nugetVersion": "1.11.2",
"nugetVersion": "1.11.2.1",
"nugetId": "Xamarin.AndroidX.Compose.UI.Text"
},
{
"groupId": "androidx.compose.ui",
"artifactId": "ui-text-android",
"version": "1.11.2",
"nugetVersion": "1.11.2",
"nugetVersion": "1.11.2.1",
"nugetId": "Xamarin.AndroidX.Compose.UI.Text.Android"
},
{
Expand Down Expand Up @@ -612,14 +612,14 @@
"groupId": "androidx.compose.ui",
"artifactId": "ui-unit",
"version": "1.11.2",
"nugetVersion": "1.11.2",
"nugetVersion": "1.11.2.1",
"nugetId": "Xamarin.AndroidX.Compose.UI.Unit"
},
{
"groupId": "androidx.compose.ui",
"artifactId": "ui-unit-android",
"version": "1.11.2",
"nugetVersion": "1.11.2",
"nugetVersion": "1.11.2.1",
"nugetId": "Xamarin.AndroidX.Compose.UI.Unit.Android"
},
{
Expand Down
13 changes: 13 additions & 0 deletions published-namespaces.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,20 @@ AndroidX.Compose.UI.Semantics
AndroidX.Compose.UI.Spatial
AndroidX.Compose.UI.State
AndroidX.Compose.UI.Text
AndroidX.Compose.UI.Text.Android
AndroidX.Compose.UI.Text.Android.Selection
AndroidX.Compose.UI.Text.Android.Style
AndroidX.Compose.UI.Text.Font
AndroidX.Compose.UI.Text.Input
AndroidX.Compose.UI.Text.Internal
AndroidX.Compose.UI.Text.Intl
AndroidX.Compose.UI.Text.Platform
AndroidX.Compose.UI.Text.Platform.Extensions
AndroidX.Compose.UI.Text.Platform.Style
AndroidX.Compose.UI.Text.Style
AndroidX.Compose.UI.Unit
AndroidX.Compose.UI.Unit.Fontscaling
AndroidX.Compose.UI.Unit.Internal
AndroidX.Compose.UI.ViewInterop
AndroidX.Compose.UI.Window
AndroidX.Concurrent.Futures
Expand Down
4 changes: 4 additions & 0 deletions source/AndroidXProject.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
"Xamarin.AndroidX.Compose.Foundation.Layout.Android",
"Xamarin.AndroidX.Compose.UI.Graphics",
"Xamarin.AndroidX.Compose.UI.Graphics.Android",
"Xamarin.AndroidX.Compose.UI.Text",
"Xamarin.AndroidX.Compose.UI.Text.Android",
"Xamarin.AndroidX.Compose.UI.Unit",
"Xamarin.AndroidX.Compose.UI.Unit.Android",
};
}
<Project Sdk="Microsoft.NET.Sdk">
Expand Down
16 changes: 16 additions & 0 deletions source/androidx.compose.foundation/foundation-layout-android/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,20 @@
calculate*Padding() impls, so the auto-generated C# class is broken.
-->
<remove-node path="/api/package[@name='androidx.compose.foundation.layout']/class[@name='PaddingValues.Absolute']" />

<!--
Now that androidx.compose.ui:ui-unit binds (Dp is resolvable), several
Kotlin inline value-class operator/extension overloads in the Flex/Grid
config scopes lower to identical primitive signatures and collide in C#
(CS0111). Rename the mangled duplicates so all overloads remain callable,
keeping the un-mangled overload on its default managed name. Mirrors the
inline-class rename approach in
androidx.compose.ui/ui-unit-android/Transforms/Metadata.xml.
-->
<attr path="/api/package[@name='androidx.compose.foundation.layout']/interface[@name='FlexConfigScope']/method[@name='basis-0680j_4']" name="managedName">Basis2</attr>
<attr path="/api/package[@name='androidx.compose.foundation.layout']/class[@name='ResolvedFlexItemInfo']/method[@name='basis-0680j_4']" name="managedName">Basis2</attr>
<attr path="/api/package[@name='androidx.compose.foundation.layout']/interface[@name='GridConfigurationScope']/method[@name='column-0680j_4']" name="managedName">Column2</attr>
<attr path="/api/package[@name='androidx.compose.foundation.layout']/interface[@name='GridConfigurationScope']/method[@name='column-XZblgos']" name="managedName">Column3</attr>
<attr path="/api/package[@name='androidx.compose.foundation.layout']/interface[@name='GridConfigurationScope']/method[@name='row-0680j_4']" name="managedName">Row2</attr>
<attr path="/api/package[@name='androidx.compose.foundation.layout']/interface[@name='GridConfigurationScope']/method[@name='row-XZblgos']" name="managedName">Row3</attr>
</metadata>
1,306 changes: 1,305 additions & 1 deletion source/androidx.compose.ui/ui-text-android/PublicAPI/PublicAPI.Unshipped.txt
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 56 additions & 17 deletions source/androidx.compose.ui/ui-text-android/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,58 @@
<metadata>
<remove-node path="/api/package" />
<!--
Force C# namespace casing to "UI" rather than the default title-cased "Ui".
Once these NuGets ship real types this is a permanent ABI decision, so we
apply it everywhere a `…ui…` package appears in
androidx.compose.ui:ui-text-android. Mirrors the casing decision in
androidx.compose.ui/ui-graphics-android/Transforms/Metadata.xml.
-->
<attr path="/api/package[@name='androidx.compose.ui.text']" name="managedName">AndroidX.Compose.UI.Text</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.android']" name="managedName">AndroidX.Compose.UI.Text.Android</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.android.selection']" name="managedName">AndroidX.Compose.UI.Text.Android.Selection</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.android.style']" name="managedName">AndroidX.Compose.UI.Text.Android.Style</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.font']" name="managedName">AndroidX.Compose.UI.Text.Font</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.input']" name="managedName">AndroidX.Compose.UI.Text.Input</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.internal']" name="managedName">AndroidX.Compose.UI.Text.Internal</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.intl']" name="managedName">AndroidX.Compose.UI.Text.Intl</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.platform']" name="managedName">AndroidX.Compose.UI.Text.Platform</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.platform.extensions']" name="managedName">AndroidX.Compose.UI.Text.Platform.Extensions</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.platform.style']" name="managedName">AndroidX.Compose.UI.Text.Platform.Style</attr>
<attr path="/api/package[@name='androidx.compose.ui.text.style']" name="managedName">AndroidX.Compose.UI.Text.Style</attr>

<!--
<remove-node
path="/api/package[@name='androidx.compose.ui.text.intl']/class[@name='LocaleList']/implements"
/>
<remove-node
path="/api/package[@name='androidx.compose.ui.text.font']/class[@name='FontListFontFamily']"
/>
<remove-node
path="/api/package[@name='androidx.compose.ui.text.font']/class[@name='FontWeight']"
/>
<remove-node
path="/api/package[@name='androidx.compose.ui.text']/class[@name='AnnotatedString']"
/>
-->

</metadata>
<!--
`FontWeight` is a Kotlin `class FontWeight … : Comparable<FontWeight>`. The
generated `compareTo(FontWeight)` cannot satisfy
`java.lang.Comparable.compareTo(Object)` (CS0535). Drop the `Comparable`
interface so the class (and its `Companion` constants such as Bold/Normal)
still bind. Mirrors the inline-class lowering caveat from
androidx.compose.ui/ui-graphics-android.
-->
<remove-node path="/api/package[@name='androidx.compose.ui.text.font']/class[@name='FontWeight']/implements[@name='java.lang.Comparable']" />

<!--
These classes implement java.util.Collection/List or java.lang.CharSequence/
Appendable, whose generated members can't satisfy the managed interface
contracts (CS0535/CS0738). Drop the interface declarations so the concrete
classes still bind with their own members.
-->
<remove-node path="/api/package[@name='androidx.compose.ui.text.intl']/class[@name='LocaleList']/implements[@name='java.util.Collection']" />
<remove-node path="/api/package[@name='androidx.compose.ui.text.font']/class[@name='FontListFontFamily']/implements[@name='java.util.List']" />
<remove-node path="/api/package[@name='androidx.compose.ui.text']/class[@name='AnnotatedString']/implements[@name='java.lang.CharSequence']" />
<remove-node path="/api/package[@name='androidx.compose.ui.text']/class[@name='AnnotatedString.Builder']/implements[@name='java.lang.Appendable']" />

<!--
`AnnotatedString.Builder.append(String): Unit` lowers to the same C#
signature as the auto-generated `string` overload of `append(CharSequence)`
(CS0111). Rename the void overload to keep both callable.
-->
<attr path="/api/package[@name='androidx.compose.ui.text']/class[@name='AnnotatedString.Builder']/method[@name='append' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" name="managedName">AppendString</attr>

<!--
These public members leak internal/unbound types (the package-private
`PlatformLocaleDelegate` interface and `kotlinx.coroutines.CoroutineDispatcher`
from a dependency that is not referenced), producing CS0234. Remove the
leaking members.
-->
<remove-node path="/api/package[@name='androidx.compose.ui.text.intl']/class[@name='PlatformLocaleKt']/method[@name='getPlatformLocaleDelegate']" />
<remove-node path="/api/package[@name='androidx.compose.ui.text.platform']/class[@name='DispatcherKt']/method[@name='getFontCacheManagementDispatcher']" />
</metadata>
Loading