[Android] move android renderers to separate nuget (#5405)

* [Android] move renderers to separate nuget

* additional android dependency

* rebase with material changes

* add android to material check

* simplify assembly info

* - add context to Init for future cases

diff --git a/.nuspec/Xamarin.Forms.Visual.Material.nuspec b/.nuspec/Xamarin.Forms.Visual.Material.nuspec
index 8e3d402..c0b74af 100644 (file)
--- a/.nuspec/Xamarin.Forms.Visual.Material.nuspec
+++ b/.nuspec/Xamarin.Forms.Visual.Material.nuspec
@@ -19,17 +19,30 @@
       <group targetFramework="MonoAndroid10">
         <dependency id="Xamarin.Forms" version="$version$"/>
       </group>
+      <group targetFramework="MonoAndroid90">
+        <dependency id="Xamarin.Android.Support.Design" version="28.0.0.1"/>
+        <dependency id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.1"/>
+      </group>
       <group targetFramework="Xamarin.iOS10">
         <dependency id="Xamarin.iOS.MaterialComponents" version="72.2.0.1"/>
       </group>
     </dependencies>
   </metadata>
   <files>
+    
+    <!--netstandard-->
     <file src="_._" target="lib\netstandard1.0\_._" />
 
+    <!--Android 10-->
     <file src="_._" target="lib\MonoAndroid10\_._" />
-    <file src="Xamarin.Forms.Visual.Material.targets" target="build\MonoAndroid10\Xamarin.Forms.Visual.Material.targets" />  
-       
+    <file src="Xamarin.Forms.Visual.Material.targets" target="build\MonoAndroid10\Xamarin.Forms.Visual.Material.targets" />
+
+    <!--Android 90-->
+    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\Xamarin.Forms.Material.dll" target="lib\MonoAndroid90" />
+    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\Xamarin.Forms.Material.*pdb" target="lib\MonoAndroid90" />
+    <file src="..\Xamarin.Forms.Material.Android\bin\$Configuration$\Xamarin.Forms.Material.*mdb" target="lib\MonoAndroid90" />
+
+    <!--iOS-->
     <file src="..\Xamarin.Forms.Material.iOS\bin\$Configuration$\Xamarin.Forms.Material.dll" target="lib\Xamarin.iOS10" />
     <file src="..\Xamarin.Forms.Material.iOS\bin\$Configuration$\Xamarin.Forms.Material.*pdb" target="lib\Xamarin.iOS10" />
     <file src="..\Xamarin.Forms.Material.iOS\bin\$Configuration$\Xamarin.Forms.Material.*mdb" target="lib\Xamarin.iOS10" />

diff --git a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
index 145fbf6..e1d72c4 100644 (file)
--- a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
+++ b/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
@@ -111,6 +111,10 @@
     <AndroidEnvironment Include="environment.txt" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v9.0' ">
+    <ProjectReference Include="..\..\Xamarin.Forms.Material.Android\Xamarin.Forms.Material.Android.csproj">
+      <Project>{e1586ce6-8eac-4388-a15a-1aabf108b5f8}</Project>
+      <Name>Xamarin.Forms.Material.Android</Name>
+    </ProjectReference>
     <PackageReference Include="Xamarin.Android.Support.v4">
       <Version>28.0.0.1</Version>
     </PackageReference>

diff --git a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
index 64ab03f..c966919 100644 (file)
--- a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
+++ b/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
@@ -268,6 +268,10 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v9.0' ">
+    <ProjectReference Include="..\..\Xamarin.Forms.Material.Android\Xamarin.Forms.Material.Android.csproj">
+      <Project>{e1586ce6-8eac-4388-a15a-1aabf108b5f8}</Project>
+      <Name>Xamarin.Forms.Material.Android</Name>
+    </ProjectReference>
     <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
       <Version>28.0.0.1</Version>
     </PackageReference>

diff --git a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
index 9737933..4ab1eb1 100644 (file)
--- a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
+++ b/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
@@ -51,6 +51,7 @@ namespace Xamarin.Forms.ControlGallery.Android
                        Forms.Init(this, bundle);
 
                        FormsMaps.Init(this, bundle);
+                       FormsMaterial.Init(this, bundle);
                        AndroidAppLinks.Init(this);
                        Forms.ViewInitialized += (sender, e) => {
                                //                              if (!string.IsNullOrWhiteSpace(e.View.StyleId)) {

diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
index ff88f8e..ec66b57 100644 (file)
--- a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
+++ b/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
@@ -329,6 +329,10 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v9.0' ">
+    <ProjectReference Include="..\Xamarin.Forms.Material.Android\Xamarin.Forms.Material.Android.csproj">
+      <Project>{e1586ce6-8eac-4388-a15a-1aabf108b5f8}</Project>
+      <Name>Xamarin.Forms.Material.Android</Name>
+    </ProjectReference>
     <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
       <Version>28.0.0.1</Version>
     </PackageReference>

diff --git a/Xamarin.Forms.Core/Visuals/VisualMarker.cs b/Xamarin.Forms.Core/Visuals/VisualMarker.cs
index edd57ba..de89be7 100644 (file)
--- a/Xamarin.Forms.Core/Visuals/VisualMarker.cs
+++ b/Xamarin.Forms.Core/Visuals/VisualMarker.cs
@@ -16,9 +16,9 @@
                                return;
 
                        _warnedAboutMaterial = true;
-                       if (Device.RuntimePlatform == Device.iOS)
-                               Internals.Log.Warning("Visual", "Material needs to be registered on iOS by calling FormsMaterial.Init() after the Xamarin.Forms.Forms.Init method call.");
-                       else if (Device.RuntimePlatform != Device.Android)
+                       if (Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Android)
+                               Internals.Log.Warning("Visual", $"Material needs to be registered on {Device.RuntimePlatform} by calling FormsMaterial.Init() after the Xamarin.Forms.Forms.Init method call.");
+                       else
                                Internals.Log.Warning("Visual", $"Material is currently not support on {Device.RuntimePlatform}.");
                }
 

diff --git a/Xamarin.Forms.Material.Android/FormsMaterial.cs b/Xamarin.Forms.Material.Android/FormsMaterial.cs
new file mode 100644 (file)
index 0000000..9fe569d
--- /dev/null
+++ b/Xamarin.Forms.Material.Android/FormsMaterial.cs
@@ -0,0 +1,16 @@
+using Android.Content;
+using Android.OS;
+
+namespace Xamarin.Forms
+{
+    public static class FormsMaterial
+    {
+        public static void Init(Context context, Bundle bundle)
+        {
+                       // my only purpose is to exist so when called
+                       // this dll doesn't get removed
+
+                       VisualMarker.RegisterMaterial();
+        }
+    }
+}
\ No newline at end of file

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialActivityIndicatorRenderer.cs b/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialActivityIndicatorRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialButtonRenderer.cs b/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialButtonRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialColors.cs b/Xamarin.Forms.Material.Android/MaterialColors.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialColors.cs
rename to Xamarin.Forms.Material.Android/MaterialColors.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialContextThemeWrapper.cs b/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialContextThemeWrapper.cs
rename to Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialDatePickerRenderer.cs b/Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialDatePickerRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialEditorRenderer.cs b/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialEditorRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialEntryRenderer.cs b/Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialEntryRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialFormsEditText.cs b/Xamarin.Forms.Material.Android/MaterialFormsEditText.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialFormsEditText.cs
rename to Xamarin.Forms.Material.Android/MaterialFormsEditText.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialFormsEditTextBase.cs b/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialFormsEditTextBase.cs
rename to Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialFormsEditTextManager.cs b/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialFormsEditTextManager.cs
rename to Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialFormsTextInputLayout.cs b/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialFormsTextInputLayout.cs
rename to Xamarin.Forms.Material.Android/MaterialFormsTextInputLayout.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialFormsTextInputLayoutBase.cs b/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialFormsTextInputLayoutBase.cs
rename to Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialFrameRenderer.cs b/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialFrameRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialPickerEditText.cs b/Xamarin.Forms.Material.Android/MaterialPickerEditText.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialPickerEditText.cs
rename to Xamarin.Forms.Material.Android/MaterialPickerEditText.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialPickerRenderer.cs b/Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialPickerRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialPickerTextInputLayout.cs b/Xamarin.Forms.Material.Android/MaterialPickerTextInputLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialPickerTextInputLayout.cs
rename to Xamarin.Forms.Material.Android/MaterialPickerTextInputLayout.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialProgressBarRenderer.cs b/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialProgressBarRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialSliderRenderer.cs b/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialSliderRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialStepperRenderer.cs b/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialStepperRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialTimePickerRenderer.cs b/Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Material/MaterialTimePickerRenderer.cs
rename to Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms.Material.Android/Properties/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..e3cd4b6
--- /dev/null
+++ b/Xamarin.Forms.Material.Android/Properties/AssemblyInfo.cs
@@ -0,0 +1,18 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using Xamarin.Forms.Internals;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Xamarin.Forms.Material")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+
+// Add some common permissions, these can be removed if not needed
+[assembly: Preserve]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]

diff --git a/Xamarin.Forms.Platform.Android/Resources/Layout/MaterialPickerTextInput.axml b/Xamarin.Forms.Material.Android/Resources/Layout/MaterialPickerTextInput.axml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/Layout/MaterialPickerTextInput.axml
rename to Xamarin.Forms.Material.Android/Resources/Layout/MaterialPickerTextInput.axml

diff --git a/Xamarin.Forms.Platform.Android/Resources/Layout/TextInputLayoutFilledBox.axml b/Xamarin.Forms.Material.Android/Resources/Layout/TextInputLayoutFilledBox.axml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/Layout/TextInputLayoutFilledBox.axml
rename to Xamarin.Forms.Material.Android/Resources/Layout/TextInputLayoutFilledBox.axml

diff --git a/Xamarin.Forms.Platform.Android/Resources/color/white_disabled_material.xml b/Xamarin.Forms.Material.Android/Resources/color/white_disabled_material.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/color/white_disabled_material.xml
rename to Xamarin.Forms.Material.Android/Resources/color/white_disabled_material.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml b/Xamarin.Forms.Material.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml
rename to Xamarin.Forms.Material.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/drawable-v21/MaterialActivityIndicatorBackground.xml b/Xamarin.Forms.Material.Android/Resources/drawable/MaterialActivityIndicatorBackground.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/drawable-v21/MaterialActivityIndicatorBackground.xml
rename to Xamarin.Forms.Material.Android/Resources/drawable/MaterialActivityIndicatorBackground.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/drawable/MaterialProgressBar.xml b/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/drawable/MaterialProgressBar.xml
rename to Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/values-v21/styles.xml b/Xamarin.Forms.Material.Android/Resources/values-v21/styles.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/values-v21/styles.xml
rename to Xamarin.Forms.Material.Android/Resources/values-v21/styles.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/values/styles.xml b/Xamarin.Forms.Material.Android/Resources/values/styles.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/values/styles.xml
rename to Xamarin.Forms.Material.Android/Resources/values/styles.xml

diff --git a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
new file mode 100644 (file)
index 0000000..a788eeb
--- /dev/null
+++ b/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E1586CE6-8EAC-4388-A15A-1AABF108B5F8}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TemplateGuid>{9ef11e43-1701-4396-8835-8392d57abb70}</TemplateGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xamarin.Forms.Material.Android</RootNamespace>
+    <AssemblyName>Xamarin.Forms.Material</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <PackageId>Xamarin.Forms.Material.Android</PackageId>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="FormsMaterial.cs" />
+    <Compile Include="MaterialActivityIndicatorRenderer.cs" />
+    <Compile Include="MaterialButtonRenderer.cs" />
+    <Compile Include="MaterialColors.cs" />
+    <Compile Include="MaterialContextThemeWrapper.cs" />
+    <Compile Include="MaterialDatePickerRenderer.cs" />
+    <Compile Include="MaterialEditorRenderer.cs" />
+    <Compile Include="MaterialEntryRenderer.cs" />
+    <Compile Include="MaterialFormsEditText.cs" />
+    <Compile Include="MaterialFormsEditTextBase.cs" />
+    <Compile Include="MaterialFormsEditTextManager.cs" />
+    <Compile Include="MaterialFormsTextInputLayout.cs" />
+    <Compile Include="MaterialFormsTextInputLayoutBase.cs" />
+    <Compile Include="MaterialFrameRenderer.cs" />
+    <Compile Include="MaterialPickerEditText.cs" />
+    <Compile Include="MaterialPickerRenderer.cs" />
+    <Compile Include="MaterialPickerTextInputLayout.cs" />
+    <Compile Include="MaterialProgressBarRenderer.cs" />
+    <Compile Include="MaterialSliderRenderer.cs" />
+    <Compile Include="MaterialStepperRenderer.cs" />
+    <Compile Include="MaterialTimePickerRenderer.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.1" />
+    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values-v21\styles.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
+      <Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
+      <Name>Xamarin.Forms.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Platform.Android.FormsViewGroup\Xamarin.Forms.Platform.Android.FormsViewGroup.csproj">
+      <Project>{3b72465b-acae-43ae-9327-10f372fe5f80}</Project>
+      <Name>Xamarin.Forms.Platform.Android.FormsViewGroup</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xamarin.Forms.Platform.Android\Xamarin.Forms.Platform.Android.csproj">
+      <Project>{0e16e70a-d6dd-4323-ad5d-363abff42d6a}</Project>
+      <Name>Xamarin.Forms.Platform.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\color\white_disabled_material.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\MaterialActivityIndicatorBackground.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\MaterialProgressBar.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-v24\MaterialActivityIndicatorBackground.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\styles.xml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\MaterialPickerTextInput.axml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Layout\TextInputLayoutFilledBox.axml">
+      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file

diff --git a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
index d85b65e..e02f1d6 100644 (file)
--- a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
+++ b/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
@@ -9,6 +9,7 @@
     <RootNamespace>Xamarin.Forms.Material.iOS</RootNamespace>
     <AssemblyName>Xamarin.Forms.Material</AssemblyName>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
+    <PackageId>Xamarin.Forms.Material.iOS</PackageId>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,7 +57,7 @@
     <PackageReference Include="Xamarin.iOS.MaterialComponents" Version="72.2.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Xamarin.Forms.Platform.Android\Material\MaterialColors.cs">
+    <Compile Include="..\Xamarin.Forms.Material.Android\MaterialColors.cs">
       <Link>MaterialColors.cs</Link>
     </Compile>
     <Compile Include="IMaterialEntryRenderer.cs" />

diff --git a/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
index 1db5669..5ae70cd 100644 (file)
--- a/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
@@ -12,6 +12,7 @@ using Xamarin.Forms.Platform.Android;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: InternalsVisibleTo("Xamarin.Forms.Platform")]
+[assembly: InternalsVisibleTo("Xamarin.Forms.Material")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
index e032473..5ef0415 100644 (file)
--- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
+++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
@@ -145,22 +145,6 @@
     <Compile Include="IBorderVisualElementRenderer.cs" />
     <Compile Include="IDeviceInfoProvider.cs" />
     <Compile Include="ITabStop.cs" />
-    <Compile Include="Material\MaterialEditorRenderer.cs" />
-    <Compile Include="Material\MaterialFormsTextInputLayoutBase.cs" />
-    <Compile Include="Material\MaterialFormsEditTextBase.cs" />
-    <Compile Include="Material\MaterialFormsEditTextManager.cs" />
-    <Compile Include="Material\MaterialPickerTextInputLayout.cs" />
-    <Compile Include="Material\MaterialFormsTextInputLayout.cs" />
-    <Compile Include="Material\MaterialPickerEditText.cs" />
-    <Compile Include="Material\MaterialContextThemeWrapper.cs" />
-    <Compile Include="Material\MaterialFrameRenderer.cs" />
-    <Compile Include="Material\MaterialFormsEditText.cs" />
-    <Compile Include="Material\MaterialButtonRenderer.cs" />
-    <Compile Include="Material\MaterialEntryRenderer.cs" />
-    <Compile Include="Material\MaterialDatePickerRenderer.cs" />
-    <Compile Include="Material\MaterialPickerRenderer.cs" />
-    <Compile Include="Material\MaterialTimePickerRenderer.cs" />
-    <Compile Include="Material\MaterialProgressBarRenderer.cs" />
     <Compile Include="IPickerRenderer.cs" />
     <Compile Include="PickerManager.cs" />
     <Compile Include="Renderers\CircularProgress.cs" />
@@ -322,16 +306,11 @@
     <Compile Include="Extensions\AccessibilityExtensions.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Renderers\IPopupTrigger.cs" />
-    <Compile Include="Material\MaterialActivityIndicatorRenderer.cs" />
-    <Compile Include="Material\MaterialColors.cs" />
     <Compile Include="ButtonElementManager.cs" />
     <Compile Include="IButtonLayoutRenderer.cs" />
     <Compile Include="ButtonLayoutManager.cs" />
-    <Compile Include="Material\MaterialSliderRenderer.cs" />
-    <AndroidResource Include="Resources\color\white_disabled_material.xml" />
     <Compile Include="IStepperRenderer.cs" />
     <Compile Include="StepperRendererManager.cs" />
-    <Compile Include="Material\MaterialStepperRenderer.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -403,41 +382,6 @@
       <Properties>CreateAllAndroidTargets=false;Configuration=$(Configuration);Platform=$(Platform);AndroidTargetFrameworkVersion=v8.1</Properties>
     </ProjectToBuild>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v9.0' ">
-    <AndroidResource Include="Resources\Layout\TextInputLayoutFilledBox.axml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-    <AndroidResource Include="Resources\values\styles.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-    <AndroidResource Include="Resources\Layout\MaterialPickerTextInput.axml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-v21\MaterialActivityIndicatorBackground.xml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-v24\MaterialActivityIndicatorBackground.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable\MaterialProgressBar.xml">
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\values-v21\styles.xml">
-      <Generator>MSBuild:UpdateGeneratedFiles</Generator>
-      <SubType>Designer</SubType>
-    </AndroidResource>
-  </ItemGroup>
   <Target Name="BeforeBuild" Condition=" '$(CreateAllAndroidTargets)' == 'true' ">
     <!--  create 8.1 binaries-->
     <MSBuild Targets="Restore" Projects="@(ProjectToBuild)">

diff --git a/Xamarin.Forms.sln b/Xamarin.Forms.sln
index 2346789..0735296 100644 (file)
--- a/Xamarin.Forms.sln
+++ b/Xamarin.Forms.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28621.142
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xamarin.Forms", "Xamarin.Forms", "{9AD757F5-E57A-459D-A0A7-E0675E045B84}"
 EndProject
@@ -195,6 +195,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Sandbox.iOS",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Sandbox.UWP", "Xamarin.Forms.Sandbox.UWP\Xamarin.Forms.Sandbox.UWP.csproj", "{868A9B7B-3977-4B56-91F7-F6B75657198B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Forms.Material.Android", "Xamarin.Forms.Material.Android\Xamarin.Forms.Material.Android.csproj", "{E1586CE6-8EAC-4388-A15A-1AABF108B5F8}"
+EndProject
 Global
        GlobalSection(SharedMSBuildProjectFiles) = preSolution
                Xamarin.Forms.Controls.Issues\Xamarin.Forms.Controls.Issues.Shared\Xamarin.Forms.Controls.Issues.Shared.projitems*{0a39a74b-6f7a-4d41-84f2-b0ccdce899df}*SharedItemsImports = 4
@@ -1579,30 +1581,6 @@ Global
                {8A75B1DC-CEED-4B1B-8675-A7DFFD1E6DE4}.Release|x64.Build.0 = Release|Any CPU
                {8A75B1DC-CEED-4B1B-8675-A7DFFD1E6DE4}.Release|x86.ActiveCfg = Release|Any CPU
                {8A75B1DC-CEED-4B1B-8675-A7DFFD1E6DE4}.Release|x86.Build.0 = Release|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|ARM.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|ARM.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|iPhone.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|x64.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|x64.Build.0 = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|x86.ActiveCfg = Debug|Any CPU
-               {E155C410-E5DE-464D-9ED7-2B1E672438ED}.AppStore|x86.Build.0 = Debug|Any CPU
                {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1627,42 +1605,6 @@ Global
                {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Release|x64.Build.0 = Release|Any CPU
                {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Release|x86.ActiveCfg = Release|Any CPU
                {E155C410-E5DE-464D-9ED7-2B1E672438ED}.Release|x86.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|ARM.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|ARM.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|ARM.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|iPhone.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|x64.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|x64.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|x64.Deploy.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|x86.ActiveCfg = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|x86.Build.0 = Release|Any CPU
-               {FDBEC08E-9452-4167-BE3B-30653190DE1E}.AppStore|x86.Deploy.0 = Release|Any CPU
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -1699,22 +1641,6 @@ Global
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.ActiveCfg = Release|Any CPU
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Build.0 = Release|Any CPU
                {FDBEC08E-9452-4167-BE3B-30653190DE1E}.Release|x86.Deploy.0 = Release|Any CPU
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|iPhone.Build.0 = AppStore|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|x64.ActiveCfg = AppStore|iPhone
-               {160053B8-745A-41DB-9B33-30479729D6DC}.AppStore|x86.ActiveCfg = AppStore|iPhone
                {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|Any CPU.ActiveCfg = Debug|iPhone
                {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|ARM.ActiveCfg = Debug|iPhone
                {160053B8-745A-41DB-9B33-30479729D6DC}.Debug|iPhone.ActiveCfg = Debug|iPhone
@@ -1731,42 +1657,6 @@ Global
                {160053B8-745A-41DB-9B33-30479729D6DC}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
                {160053B8-745A-41DB-9B33-30479729D6DC}.Release|x64.ActiveCfg = Release|iPhone
                {160053B8-745A-41DB-9B33-30479729D6DC}.Release|x86.ActiveCfg = Release|iPhone
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|Any CPU.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|ARM.Build.0 = Release|ARM
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|ARM.Deploy.0 = Release|ARM
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|iPhone.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|iPhone.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|iPhone.Deploy.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|x64.ActiveCfg = Release|x64
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|x64.Build.0 = Release|x64
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|x64.Deploy.0 = Release|x64
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|x86.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|x86.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.Ad-Hoc|x86.Deploy.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|Any CPU.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|Any CPU.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|Any CPU.Deploy.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|ARM.ActiveCfg = Release|ARM
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|ARM.Build.0 = Release|ARM
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|ARM.Deploy.0 = Release|ARM
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|iPhone.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|iPhone.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|iPhone.Deploy.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|iPhoneSimulator.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|iPhoneSimulator.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|iPhoneSimulator.Deploy.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|x64.ActiveCfg = Release|x64
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|x64.Build.0 = Release|x64
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|x64.Deploy.0 = Release|x64
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|x86.ActiveCfg = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|x86.Build.0 = Release|x86
-               {868A9B7B-3977-4B56-91F7-F6B75657198B}.AppStore|x86.Deploy.0 = Release|x86
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|Any CPU.ActiveCfg = Debug|x86
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.ActiveCfg = Debug|ARM
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Debug|ARM.Build.0 = Debug|ARM
@@ -1791,6 +1681,30 @@ Global
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Release|x86.ActiveCfg = Release|x86
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Release|x86.Build.0 = Release|x86
                {868A9B7B-3977-4B56-91F7-F6B75657198B}.Release|x86.Deploy.0 = Release|x86
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|ARM.ActiveCfg = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|ARM.Build.0 = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|iPhone.Build.0 = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|x64.Build.0 = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Debug|x86.Build.0 = Debug|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|Any CPU.Build.0 = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|ARM.ActiveCfg = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|ARM.Build.0 = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|iPhone.ActiveCfg = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|iPhone.Build.0 = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|x64.ActiveCfg = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|x64.Build.0 = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|x86.ActiveCfg = Release|Any CPU
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8}.Release|x86.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
@@ -1861,6 +1775,7 @@ Global
                {FDBEC08E-9452-4167-BE3B-30653190DE1E} = {ED56954D-28FE-42BF-A5FD-AD5AD5AF0A0C}
                {160053B8-745A-41DB-9B33-30479729D6DC} = {ED56954D-28FE-42BF-A5FD-AD5AD5AF0A0C}
                {868A9B7B-3977-4B56-91F7-F6B75657198B} = {ED56954D-28FE-42BF-A5FD-AD5AD5AF0A0C}
+               {E1586CE6-8EAC-4388-A15A-1AABF108B5F8} = {F6F6A11F-CA66-4C7E-AB84-CD21D817C2CD}
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
                SolutionGuid = {650AE971-2F29-46A8-822C-FB4FCDC6A9A0}

diff --git a/build/steps/build-windows.yml b/build/steps/build-windows.yml
index 546f9ef..2d9b40e 100644 (file)
--- a/build/steps/build-windows.yml
+++ b/build/steps/build-windows.yml
@@ -59,6 +59,9 @@ steps:
           Xamarin.Forms.Material.iOS/bin/$(BuildConfiguration)/**/*.dll
           Xamarin.Forms.Material.iOS/bin/$(BuildConfiguration)/**/*.pdb
           Xamarin.Forms.Material.iOS/bin/$(BuildConfiguration)/**/*.mdb
+          Xamarin.Forms.Material.Android/bin/$(BuildConfiguration)/**/*.dll
+          Xamarin.Forms.Material.Android/bin/$(BuildConfiguration)/**/*.pdb
+          Xamarin.Forms.Material.Android/bin/$(BuildConfiguration)/**/*.mdb
           Xamarin.Forms.Platform.WP8/bin/$(BuildConfiguration)/**/*.dll
           Xamarin.Forms.Platform.UAP/bin/$(BuildConfiguration)/**/*.pdb
           Xamarin.Forms.Platform.UAP/bin/$(BuildConfiguration)/**/*.dll