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

[Core] Remove Expander #12005

Merged
merged 6 commits into from
Sep 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Issue7780.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue8958.xaml.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue10679.xaml.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue10830.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue10735.xaml.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue10497.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Issue10477.xaml.cs" />
Expand Down Expand Up @@ -1785,7 +1784,7 @@
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue11653.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue11496.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
Expand Down
2 changes: 0 additions & 2 deletions Xamarin.Forms.Controls/CoreGallery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using Xamarin.Forms.Controls.GalleryPages.SwipeViewGalleries;
using Xamarin.Forms.Controls.GalleryPages.PlatformTestsGallery;
using Xamarin.Forms.Controls.GalleryPages.AppThemeGalleries;
using Xamarin.Forms.Controls.GalleryPages.ExpanderGalleries;
using Xamarin.Forms.Controls.GalleryPages.RadioButtonGalleries;
using Xamarin.Forms.Controls.GalleryPages.ShapesGalleries;
using Xamarin.Forms.Controls.GalleryPages.GradientGalleries;
Expand Down Expand Up @@ -306,7 +305,6 @@ public override string ToString()
new GalleryPageFactory(() => new RadioButtonGalleries(), "RadioButton Gallery"),
new GalleryPageFactory(() => new RadioButtonCoreGalleryPage(), "RadioButton Core Gallery"),
new GalleryPageFactory(() => new FontImageSourceGallery(), "Font ImageSource"),
new GalleryPageFactory(() => new ExpanderGalleries(), "Expander Gallery"),
new GalleryPageFactory(() => new IndicatorGalleries(), "IndicatorView Gallery"),
new GalleryPageFactory(() => new CarouselViewGallery(), "CarouselView Gallery"),
new GalleryPageFactory(() => new CarouselViewCoreGalleryPage(), "CarouselView Core Gallery"),
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -128,17 +128,6 @@
<Entry
x:Name="Entry"
Text="Entry"/>
<Expander
x:Name="Expander">
<Expander.Header>
<Label
Text="Expander Header" />
</Expander.Header>
<Grid>
<Label
Text="Expander Content" />
</Grid>
</Expander>
<Frame
x:Name="Frame"
CornerRadius="12"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ void UpdateBackgroundColor(Color? color)
DatePicker.BackgroundColor = backgroundColor;
Editor.BackgroundColor = backgroundColor;
Entry.BackgroundColor = backgroundColor;
Expander.BackgroundColor = backgroundColor;
Frame.BackgroundColor = backgroundColor;
Grid.BackgroundColor = backgroundColor;
ImageButton.BackgroundColor = backgroundColor;
Expand Down Expand Up @@ -89,7 +88,6 @@ void UpdateBackground(Brush background)
DatePicker.Background = background;
Editor.Background = background;
Entry.Background = background;
Expander.Background = background;
Frame.Background = background;
Grid.Background = background;
ImageButton.Background = background;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ void ButtonClicked(object sender, System.EventArgs e)
button.TextColor = Color.Black;
button.IsEnabled = false;

Device.SetFlags(new[] { ExperimentalFlags.BrushExperimental, ExperimentalFlags.ExpanderExperimental, ExperimentalFlags.ShapesExperimental, ExperimentalFlags.SwipeViewExperimental });
Device.SetFlags(new[] { ExperimentalFlags.BrushExperimental, ExperimentalFlags.ShapesExperimental, ExperimentalFlags.SwipeViewExperimental });
}
}
}
Loading