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

Jump to bottom

[Build] Build ControLGallery Android #523

Closed
wants to merge 2 commits into from
Closed

[Build] Build ControLGallery Android #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e9109c
Try to get the Android Control Gallery running again (#489)
mattleibow Mar 16, 2021
f92ff4e
Try build android on CI
rmarinho Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1,663 changes: 1,663 additions & 0 deletions Compatibility.ControlGallery.sln
View file
Open in desktop

Large diffs are not rendered by default.

971 changes: 0 additions & 971 deletions ControlGallery.sln
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions Microsoft.Maui.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2ACC7FFA-2
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\src\Core.csproj", "{29913989-0F70-48D8-8EDE-B1DD217F21D1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compatibility.Android.FormsViewGroup", "src\Compatibility\Core\src\Android.FormsViewGroup\Compatibility.Android.FormsViewGroup.csproj", "{3B72465B-ACAE-43AE-9327-10F372FE5F80}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.Android.FormsViewGroup", "src\Compatibility\Core\src\Android.FormsViewGroup\Compatibility.Android.FormsViewGroup.csproj", "{3B72465B-ACAE-43AE-9327-10F372FE5F80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compatibility.iOS", "src\Compatibility\Core\src\iOS\Compatibility.iOS.csproj", "{271193C1-6E7C-429C-A36D-3F1BE5267231}"
EndProject
Expand Down Expand Up @@ -147,14 +147,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleProject", "SingleProj
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.CustomAttributes", "src\Controls\tests\CustomAttributes\Controls.CustomAttributes.csproj", "{D816B818-F58F-4738-93AE-924EFAB7A07F}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ControlGallery.Issues.Shared", "src\ControlGallery\src\Xamarin.Forms.Controls.Issues.Shared\ControlGallery.Issues.Shared.shproj", "{0F0DB9CC-EA65-429C-9363-38624BF8F49C}"
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.ControlGallery.Issues.Shared", "src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.shproj", "{AE2513CB-4E5E-4E5C-8237-88954D4C9433}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlGallery", "src\ControlGallery\src\Xamarin.Forms.Controls\ControlGallery.csproj", "{B5F94CCB-5868-43BD-89B5-B66C97C3A741}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Core", "src\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core.csproj", "{B5F94CCB-5868-43BD-89B5-B66C97C3A741}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\ControlGallery\src\Xamarin.Forms.Controls.Issues.Shared\ControlGallery.Issues.Shared.projitems*{0f0db9cc-ea65-429c-9363-38624bf8f49c}*SharedItemsImports = 13
src\ControlGallery\src\Xamarin.Forms.Controls.Issues.Shared\ControlGallery.Issues.Shared.projitems*{b5f94ccb-5868-43bd-89b5-b66c97c3a741}*SharedItemsImports = 5
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{b5f94ccb-5868-43bd-89b5-b66c97c3a741}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1465,7 +1465,7 @@ Global
{62DBB813-E489-45D7-BF32-E64D04649CC8} = {B688531D-C2BD-41FC-9694-5311346DB789}
{CB2072E0-A437-4811-AE17-16CAE0DDA1B1} = {99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}
{D816B818-F58F-4738-93AE-924EFAB7A07F} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
{0F0DB9CC-EA65-429C-9363-38624BF8F49C} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
{AE2513CB-4E5E-4E5C-8237-88954D4C9433} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
{B5F94CCB-5868-43BD-89B5-B66C97C3A741} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
16 changes: 8 additions & 8 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,25 +45,25 @@ if(String.IsNullOrWhiteSpace(target))

var IOS_SIM_NAME = GetBuildVariable("IOS_SIM_NAME", "iPhone 7");
var IOS_SIM_RUNTIME = GetBuildVariable("IOS_SIM_RUNTIME", "com.apple.CoreSimulator.SimRuntime.iOS-12-4");
var IOS_CONTROLGALLERY_PROJ = "src/ControlGallery/src/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj";
var IOS_TEST_PROJ = "./src/ControlGallery/test/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj";
var IOS_TEST_LIBRARY = Argument("IOS_TEST_LIBRARY", $"./src/ControlGallery/test/Xamarin.Forms.Core.iOS.UITests/bin/{configuration}/Xamarin.Forms.Core.iOS.UITests.dll");
var IOS_IPA_PATH = Argument("IOS_IPA_PATH", $"./src/ControlGallery/test/Xamarin.Forms.ControlGallery.iOS/bin/iPhoneSimulator/{configuration}/XamarinFormsControlGalleryiOS.app");
var IOS_CONTROLGALLERY_PROJ = "src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj";
var IOS_TEST_PROJ = ".src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj";
var IOS_TEST_LIBRARY = Argument("IOS_TEST_LIBRARY", $".src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.iOS.UITests/bin/{configuration}/Xamarin.Forms.Core.iOS.UITests.dll");
var IOS_IPA_PATH = Argument("IOS_IPA_PATH", $".src/Compatibility/ControlGallery/test/Xamarin.Forms.ControlGallery.iOS/bin/iPhoneSimulator/{configuration}/XamarinFormsControlGalleryiOS.app");
var IOS_BUNDLE_ID = "com.xamarin.xamarin-forms-controlgallery";
var IOS_BUILD_IPA = Argument("IOS_BUILD_IPA", (target == "cg-ios-deploy") ? true : (false || isCIBuild) );
Guid IOS_SIM_UDID = Argument("IOS_SIM_UDID", Guid.Empty);

var UWP_PACKAGE_ID = "0d4424f6-1e29-4476-ac00-ba22c3789cb6";
var UWP_TEST_LIBRARY = GetBuildVariable("UWP_TEST_LIBRARY", $"./src/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/bin/{configuration}/Xamarin.Forms.Core.Windows.UITests.dll");
var UWP_TEST_LIBRARY = GetBuildVariable("UWP_TEST_LIBRARY", $"./src/Compatibility/ControlGallery/test/Xamarin.Forms.Core.Windows.UITests/bin/{configuration}/Xamarin.Forms.Core.Windows.UITests.dll");
var UWP_PFX_PATH = Argument("UWP_PFX_PATH", "Xamarin.Forms.ControlGallery.WindowsUniversal\\Xamarin.Forms.ControlGallery.WindowsUniversal_TemporaryKey.pfx");
var UWP_APP_PACKAGES_PATH = Argument("UWP_APP_PACKAGES_PATH", "*/AppPackages/");
var UWP_APP_DRIVER_INSTALL_PATH = Argument("UWP_APP_DRIVER_INSTALL_PATH", "https://github.com/microsoft/WinAppDriver/releases/download/v1.2-RC/WindowsApplicationDriver.msi");

var ANDROID_BUNDLE_ID = "com.xamarin.xamarin_forms_controlgallery";
var ANDROID_CONTROLGALLERY = "src/ControlGallery/src/Xamarin.Forms.ControlGallery.Android/";
var ANDROID_CONTROLGALLERY_PROJ = $"{ANDROID_CONTROLGALLERY}Xamarin.Forms.ControlGallery.Android.csproj";
var ANDROID_CONTROLGALLERY = "src/Compatibility/ControlGallery/src/Android/";
var ANDROID_CONTROLGALLERY_PROJ = $"{ANDROID_CONTROLGALLERY}Compatibility.ControlGallery.Android.csproj";
var ANDROID_RENDERERS = Argument("ANDROID_RENDERERS", "FAST");
var ANDROID_TEST_PROJ = "./src/ControlGallery/test/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj";
var ANDROID_TEST_PROJ = "./src/Compatibility/ControlGallery/test/Android.UITests/Compatibility.ControlGallery.Android.UITests.csproj";

var BUILD_TASKS_PROJ ="Microsoft.Maui.BuildTasks.sln";

Expand Down
5 changes: 0 additions & 5 deletions eng/ControlGallery.Build.props
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions eng/pipelines/common/controlgallery-android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ steps:
displayName: 'Copy Android Files for UITest'
inputs:
Contents: |
**/Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.*
**/Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/nunit.*
**/Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/NUnit3.*
**/Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/Plugin.*
**/Xamarin.Forms.Core.Android.UITests/bin/$(BuildConfiguration)/Xamarin.*
**/Android.UITests/bin/$(BuildConfiguration)/Newtonsoft.Json.*
**/Android.UITests/bin/$(BuildConfiguration)/nunit.*
**/Android.UITests/bin/$(BuildConfiguration)/NUnit3.*
**/Android.UITests/bin/$(BuildConfiguration)/Plugin.*
**/Android.UITests/bin/$(BuildConfiguration)/Xamarin.*
TargetFolder: '$(build.artifactstagingdirectory)/android'
CleanTargetFolder: true
flattenFolders: true

- task: CopyFiles@2
displayName: 'Copy $(renderers)'
inputs:
SourceFolder: src/ControlGallery/src/Xamarin.Forms.ControlGallery.Android/bin/$(BuildConfiguration)/
SourceFolder: src/Compatibility/ControlGallery/src/Android/bin/$(BuildConfiguration)/
Contents: '**/*.apk'
TargetFolder: '$(build.artifactstagingdirectory)/androidApp'
CleanTargetFolder: true
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/common/controlgallery-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ steps:
- task: CopyFiles@2
displayName: 'Copy iOS dSYM'
inputs:
SourceFolder: 'src/ControlGallery/src/Xamarin.Forms.ControlGallery.iOS/bin/iPhone/$(BuildConfiguration)/XamarinFormsControlGalleryiOS.app.dSYM/'
SourceFolder: 'src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.iOS/bin/iPhone/$(BuildConfiguration)/XamarinFormsControlGalleryiOS.app.dSYM/'
TargetFolder: '$(build.artifactstagingdirectory)/ios/iPhone/XamarinFormsControlGalleryiOS.app.dSYM/'
CleanTargetFolder: false
flattenFolders: false

- task: CopyFiles@2
displayName: 'Copy iOS App'
inputs:
SourceFolder: 'src/ControlGallery/src/Xamarin.Forms.ControlGallery.iOS/bin/iPhoneSimulator/$(BuildConfiguration)/XamarinFormsControlGalleryiOS.app/'
SourceFolder: 'src/Compatibility/ControlGallery/src/Xamarin.Forms.ControlGallery.iOS/bin/iPhoneSimulator/$(BuildConfiguration)/XamarinFormsControlGalleryiOS.app/'
TargetFolder: '$(build.artifactstagingdirectory)/ios/iPhoneSimulator/XamarinFormsControlGalleryiOS.app/'
CleanTargetFolder: false
flattenFolders: false
Expand Down
40 changes: 20 additions & 20 deletions eng/pipelines/handlers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,26 +109,26 @@ stages:
# steps:
# - template: common/controlgallery-ios.yml

# - stage: build_android
# displayName: Android
# dependsOn: []
# jobs:
# - job: android
# workspace:
# clean: all
# displayName: Build ControlGallery Android
# timeoutInMinutes: 120
# pool:
# name: $(macOSXVmPool)
# vmImage: $(macOSXVmImage)
# variables:
# renderers: 'FAST'
# outputfolder: 'newRenderers'
# provisionator.xcode : '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
# provisionator.path : '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
# provisionator.extraArguments : '--v'
# steps:
# - template: common/controlgallery-android.yml
- stage: build_android
displayName: Android
dependsOn: []
jobs:
- job: android
workspace:
clean: all
displayName: Build ControlGallery Android
timeoutInMinutes: 120
pool:
name: $(macOSXVmPool)
vmImage: $(macOSXVmImage)
variables:
renderers: 'FAST'
outputfolder: 'newRenderers'
provisionator.xcode : '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
provisionator.path : '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
provisionator.extraArguments : '--v'
steps:
- template: common/controlgallery-android.yml

- stage: pack_net6
displayName: Pack .NET 6
Expand Down
8 changes: 4 additions & 4 deletions ...Forms.ControlGallery.Android/Activity1.cs → ...y/ControlGallery/src/Android/Activity1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
using Android.Widget;
using Java.Interop;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.ControlGallery.Android;
using Microsoft.Maui.Controls.ControlGallery;
using Microsoft.Maui.Controls.ControlGallery.Issues;
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Android;
using Microsoft.Maui.Controls.Compatibility.ControlGallery;
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
using Microsoft.Maui.Controls.Compatibility;
using Microsoft.Maui.Controls.Compatibility.Platform.Android;
using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppLinks;
Expand All @@ -24,7 +24,7 @@
[assembly: ExportRenderer (typeof (DisposeLabel), typeof (DisposeLabelRenderer))]
[assembly: ExportEffect (typeof (BorderEffect), "BorderEffect")]

namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
public partial class Activity1
{
Expand Down
6 changes: 3 additions & 3 deletions ...ontrolGallery.Android/ApiLabelRenderer.cs → ...olGallery/src/Android/ApiLabelRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
using Android.Content;
using Android.OS;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.ControlGallery.Android;
using Microsoft.Maui.Controls.ControlGallery;
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Android;
using Microsoft.Maui.Controls.Compatibility.ControlGallery;
using Microsoft.Maui.Controls.Compatibility;
using Microsoft.Maui.Controls.Compatibility.Platform.Android;

[assembly: ExportRenderer(typeof(ApiLabel), typeof(ApiLabelRenderer))]
namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
public class ApiLabelRenderer : Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers.LabelRenderer
{
Expand Down
0 ....Android/Assets/WebImages/XamarinLogo.png → .../Android/Assets/WebImages/XamarinLogo.png
View file
Open in desktop
File renamed without changes
0 ...ControlGallery.Android/Assets/default.css → ...rolGallery/src/Android/Assets/default.css
View file
Open in desktop
File renamed without changes.
0 ...rolGallery.Android/Assets/fonts/icons.xml → ...allery/src/Android/Assets/fonts/icons.xml
View file
Open in desktop
File renamed without changes.
0 ...Gallery.Android/Assets/fonts/ionicons.ttf → ...ery/src/Android/Assets/fonts/ionicons.ttf
View file
Open in desktop
File renamed without changes.
0 ...trolGallery.Android/Assets/googlemap.html → ...Gallery/src/Android/Assets/googlemap.html
View file
Open in desktop
File renamed without changes.
0 ...llery.Android/Assets/googlemapsearch.html → ...y/src/Android/Assets/googlemapsearch.html
View file
Open in desktop
File renamed without changes.
0 ....ControlGallery.Android/Assets/local.html → ...trolGallery/src/Android/Assets/local.html
View file
Open in desktop
File renamed without changes.
0 ...ms.ControlGallery.Android/Assets/test.jpg → ...ontrolGallery/src/Android/Assets/test.jpg
View file
Open in desktop
File renamed without changes
6 changes: 3 additions & 3 deletions ...ry.Android/AttachedStateEffectRenderer.cs → ...rc/Android/AttachedStateEffectRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System;
using System.Linq;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.ControlGallery.Android;
using Microsoft.Maui.Controls.ControlGallery.Effects;
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Android;
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Effects;
using Microsoft.Maui.Controls.Compatibility.Platform.Android;

[assembly: ExportEffect(typeof(AttachedStateEffectRenderer), AttachedStateEffect.EffectName)]
namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
public class AttachedStateEffectRenderer : PlatformEffect
{
Expand Down
2 changes: 1 addition & 1 deletion ...ms.ControlGallery.Android/BorderEffect.cs → ...ontrolGallery/src/Android/BorderEffect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Microsoft.Maui.Controls.Compatibility.Platform.Android;

namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
public class BorderEffect : PlatformEffect
{
Expand Down
6 changes: 3 additions & 3 deletions ...llery.Android/BrokenImageSourceHandler.cs → ...y/src/Android/BrokenImageSourceHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
using Android.Content;
using Android.Graphics;
using Microsoft.Maui.Controls;
using Microsoft.Maui.Controls.ControlGallery.Android;
using Microsoft.Maui.Controls.ControlGallery.Issues;
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Android;
using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
using Microsoft.Maui.Controls.Compatibility.Platform.Android;
using Microsoft.Maui.Controls.Compatibility;

[assembly: ExportRenderer(typeof(_51173Image), typeof(_51173CustomImageRenderer))]
namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
public sealed class BrokenImageSourceHandler : IImageSourceHandler
{
Expand Down
2 changes: 1 addition & 1 deletion ...rolGallery.Android/BrokenNativeControl.cs → ...allery/src/Android/BrokenNativeControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Android.Views;
using Android.Widget;

namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
/// <summary>
/// This is a custom Android control which deliberately does some incorrect measuring
Expand Down
4 changes: 2 additions & 2 deletions ...ms.ControlGallery.Android/CacheService.cs → ...ontrolGallery/src/Android/CacheService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.IO.IsolatedStorage;
using Microsoft.Maui.Controls.ControlGallery;
using Microsoft.Maui.Controls.Compatibility.ControlGallery;
using IOPath = System.IO.Path;

namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
public class CacheService : ICacheService
{
Expand Down
2 changes: 1 addition & 1 deletion ...rms.ControlGallery.Android/ColorPicker.cs → ...ControlGallery/src/Android/ColorPicker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Maui.Controls.Compatibility.Platform.Android;
using Droid = Android;

namespace Microsoft.Maui.Controls.ControlGallery.Android
namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
{
public class ColorPickerView : ViewGroup
//, INotifyPropertyChanged
Expand Down
Loading