Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into Issue7480
  • Loading branch information
jonpryor committed Mar 20, 2024
commit cc42d7961d835bcb0b6f7ad1e6cf0ce5482c5532
23 changes: 19 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Resources/LayoutBinding.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ namespace Xamarin.Android.Design

abstract class LayoutBinding
{
const DynamicallyAccessedMemberTypes Constructors = DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors;

Activity? boundActivity;
View? boundView;
OnLayoutItemNotFoundHandler? onLayoutItemNotFound;
Expand Down Expand Up @@ -64,8 +66,14 @@ Activity EnsureActivity ()
throw new InvalidOperationException ("Finding fragments is supported only for Activity instances");
}

T __FindFragment<T> (int resourceId, Func<Activity, T?> finder, ref T? cachedField)
where T : Java.Lang.Object
T __FindFragment<
[DynamicallyAccessedMembers (Constructors)]
T
> (
int resourceId,
Func<Activity, T?> finder,
ref T? cachedField)
where T: Java.Lang.Object
{
if (cachedField != null)
return cachedField;
Expand All @@ -82,8 +90,15 @@ T __FindFragment<T> (int resourceId, Func<Activity, T?> finder, ref T? cachedFie
}
#if __ANDROID_11__
#pragma warning disable CA1422
protected T FindFragment<T> (int resourceId, global::Android.App.Fragment? __ignoreMe, ref T? cachedField)
where T : global::Android.App.Fragment
protected T FindFragment<
[DynamicallyAccessedMembers (Constructors)]
T
> (
int resourceId,
global::Android.App.Fragment? __ignoreMe,
ref T? cachedField
)
where T: global::Android.App.Fragment
{
return __FindFragment<T> (resourceId, (activity) => activity.FragmentManager?.FindFragmentById<T> (resourceId), ref cachedField);
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.