Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Use correct renderers for pre-AppCompat #1044

Merged
merged 3 commits into from Jul 24, 2017
Merged

Use correct renderers for pre-AppCompat #1044

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
3b2ee47
Use correct renderers for pre-AppCompat activity
hartez Jul 7, 2017
8baec28
Removed extraneous using
hartez Jul 7, 2017
10e2eca
Fix formatting
hartez Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Stubs/Xamarin.Forms.Platform.cs
View file
Open in desktop
Expand Up @@ -35,14 +35,14 @@ internal class _EntryRenderer { }
[RenderWith (typeof (EditorRenderer))]
internal class _EditorRenderer { }
#if __ANDROID__
[RenderWith (typeof (Xamarin.Forms.Platform.Android.FastRenderers.LabelRenderer))]
[RenderWith(typeof(Xamarin.Forms.Platform.Android.LabelRenderer))]
#else
[RenderWith (typeof (LabelRenderer))]
#endif
internal class _LabelRenderer { }

#if __ANDROID__
[RenderWith(typeof(Xamarin.Forms.Platform.Android.FastRenderers.ImageRenderer))]
[RenderWith(typeof(Xamarin.Forms.Platform.Android.ImageRenderer))]
#else
[RenderWith (typeof (ImageRenderer))]
#endif
Expand Down
4 changes: 3 additions & 1 deletion Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
View file
Open in desktop
Expand Up @@ -119,8 +119,10 @@ protected void LoadApplication(Application application)
RegisterHandlerForDefaultRenderer(typeof(Button), typeof(FastRenderers.ButtonRenderer), typeof(ButtonRenderer));
RegisterHandlerForDefaultRenderer(typeof(Switch), typeof(AppCompat.SwitchRenderer), typeof(SwitchRenderer));
RegisterHandlerForDefaultRenderer(typeof(Picker), typeof(AppCompat.PickerRenderer), typeof(PickerRenderer));
RegisterHandlerForDefaultRenderer(typeof(Frame), typeof(AppCompat.FrameRenderer), typeof(FrameRenderer));
RegisterHandlerForDefaultRenderer(typeof(Frame), typeof(FastRenderers.FrameRenderer), typeof(FrameRenderer));
RegisterHandlerForDefaultRenderer(typeof(CarouselPage), typeof(AppCompat.CarouselPageRenderer), typeof(CarouselPageRenderer));
RegisterHandlerForDefaultRenderer(typeof(Label), typeof(FastRenderers.LabelRenderer), typeof(LabelRenderer));
RegisterHandlerForDefaultRenderer(typeof(Image), typeof(FastRenderers.ImageRenderer), typeof(ImageRenderer));

_renderersAdded = true;
}
Expand Down