Skip to content
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

Remove obsoleted OpenGLView #12579

Merged
merged 3 commits into from
Feb 1, 2023
Merged

Remove obsoleted OpenGLView #12579

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
bb508e7
Remove obsoleted OpenGLView
jfversluis Jan 11, 2023
99389f1
Restore accidentally deleted files
jfversluis Jan 12, 2023
70da3cb
Merge remote-tracking branch 'origin/main' into remove-openglview
mattleibow Feb 1, 2023
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
1 change: 0 additions & 1 deletion src/Compatibility/ControlGallery/src/Android/Compatibility.ControlGallery.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
</ItemGroup>

<ItemGroup>
<Compile Include="..\Core\GalleryPages\OpenGLGalleries\AdvancedOpenGLGallery.cs" Link="GalleryPages\AdvancedOpenGLGallery.cs" />
<ProguardConfiguration Include="..\..\..\..\..\.nuspec\proguard.cfg" />
<AndroidAsset Include="Assets\**" />
<AndroidResource Include="Resources\**" />
Expand Down
4 changes: 0 additions & 4 deletions src/Compatibility/ControlGallery/src/Android/PlatformSpecificCoreGalleryFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ public class PlatformSpecificCoreGalleryFactory : IPlatformSpecificCoreGalleryFa

public IEnumerable<(Func<Page> Create, string Title)> GetPages()
{
#if HAVE_OPENTK
yield return (() => new AdvancedOpenGLGallery(), "Advanced OpenGL Gallery - Legacy");
#else
return null;
#endif
}
}
}
2 changes: 0 additions & 2 deletions src/Compatibility/ControlGallery/src/Core/ControlGalleryPages/FlowDirectionGallery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,6 @@ void SetContent(FlowDirection direction)
lbl3.HorizontalTextAlignment = TextAlignment.Center;
lbl3.Text = "Center text";

//var ogv = AddView<OpenGLView>(grid, ref col, ref row, hOptions, vOptions, margin);

var pkr = AddView<Picker>(grid, ref col, ref row);
pkr.ItemsSource = Enumerable.Range(0, 10).ToList();

Expand Down
5 changes: 0 additions & 5 deletions src/Compatibility/ControlGallery/src/Core/CoreGallery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,6 @@ public override string ToString()
new GalleryPageFactory(() => new KeyboardCoreGallery(), "Keyboard Gallery"),
new GalleryPageFactory(() => new LabelCoreGalleryPage(), "Label Gallery"),
new GalleryPageFactory(() => new ListViewCoreGalleryPage(), "ListView Gallery"),
new GalleryPageFactory(() => new OpenGLViewCoreGalleryPage(), "OpenGLView Gallery"),
new GalleryPageFactory(() => new PickerCoreGalleryPage(), "Picker Gallery"),
new GalleryPageFactory(() => new ProgressBarCoreGalleryPage(), "ProgressBar Gallery"),
new GalleryPageFactory(() => new MaterialProgressBarGallery(), "ProgressBar & Slider Gallery (Material)"),
Expand Down Expand Up @@ -422,10 +421,6 @@ public override string ToString()
new GalleryPageFactory(() => new MinimumSizeGallery(), "MinimumSize Gallery - Legacy"),
new GalleryPageFactory(() => new MultiGallery(), "Multi Gallery - Legacy"),
new GalleryPageFactory(() => new NavigationPropertiesGallery(), "Navigation Properties"),
#if HAVE_OPENTK
new GalleryPageFactory(() => new BasicOpenGLGallery(), "Basic OpenGL Gallery - Legacy"),
new GalleryPageFactory(() => new AdvancedOpenGLGallery(), "Advanced OpenGL Gallery - Legacy"),
#endif
new GalleryPageFactory(() => new PickerGallery(), "Picker Gallery - Legacy"),
new GalleryPageFactory(() => new ProgressBarGallery(), "ProgressBar Gallery - Legacy"),
new GalleryPageFactory(() => new RelativeLayoutGallery(), "RelativeLayout Gallery - Legacy"),
Expand Down
16 changes: 0 additions & 16 deletions src/Compatibility/ControlGallery/src/Core/CoreGalleryPages/OpenGLViewCoreGalleryPage.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Compatibility/ControlGallery/src/Core/GalleryPages/MemoryLeakGallery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ public MemoryLeakGallery()
MakeButton(nameof(WebView), () => new WebView { BackgroundColor = Colors.Azure, HeightRequest = 50 }),
MakeButton(nameof(ProgressBar), () => new ProgressBar { BackgroundColor = Colors.Azure, Progress = 0.5 }),
MakeButton(nameof(Picker), () => new Picker { BackgroundColor = Colors.Azure, HeightRequest = 50 }),
MakeButton(nameof(OpenGLView), () => new OpenGLView ()),
MakeButton(nameof(SearchBar), () => new SearchBar ()),
MakeButton(nameof(Slider), () => new Slider ()),
MakeButton(nameof(Stepper), () => new Stepper ()),
Expand Down
218 changes: 0 additions & 218 deletions ...mpatibility/ControlGallery/src/Core/GalleryPages/OpenGLGalleries/AdvancedOpenGLGallery.cs
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions src/Compatibility/ControlGallery/src/Core/GalleryPages/OpenGLGalleries/BasicOpenGLGallery.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Compatibility/ControlGallery/src/Issues.Shared/Helpers/ViewHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public static List<View> GetAllViews()
new ListView { ItemsSource = Enumerable.Range(0,10), ItemTemplate = new DataTemplate(typeof(ImageCell)) },
new ListView { ItemsSource = Enumerable.Range(0,10), ItemTemplate = new DataTemplate(typeof(EntryCell)) },
new ListView { ItemsSource = Enumerable.Range(0,10), ItemTemplate = new DataTemplate(typeof(SwitchCell)) },
new OpenGLView { },
new Picker { },
new ProgressBar { },
new SearchBar { },
Expand Down
Loading