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

[Enhancement] Add Visual progress behind feature flag #4449

Merged
merged 13 commits into from
Nov 23, 2018
Merged

[Enhancement] Add Visual progress behind feature flag #4449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6aff035
Visual
PureWeen Nov 20, 2018
f022358
add progress bar and fix ui tint color
PureWeen Nov 20, 2018
de7a9f0
Progress Bar Updates
PureWeen Nov 20, 2018
b6efee2
ios padding fixes
PureWeen Nov 21, 2018
8abd9f0
padding fix and button image positioning fixes
PureWeen Nov 21, 2018
1953f7d
added button themes
PureWeen Nov 21, 2018
ed249ca
disable tint and open up material android button
PureWeen Nov 21, 2018
54ef014
change image to bank
PureWeen Nov 21, 2018
3acf487
add overrides for Material Frame Renderer
PureWeen Nov 21, 2018
2ba7462
remove commented out code
PureWeen Nov 21, 2018
33c392f
change back to Full linker
PureWeen Nov 22, 2018
804bf78
applying comment fixes
PureWeen Nov 22, 2018
ae3cce4
change comparison
PureWeen Nov 22, 2018
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
6 changes: 6 additions & 0 deletions .nuspec/Xamarin.Forms.Maps.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="27.0.2"/>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.GooglePlayServices.Maps" version="60.1142.1"/>
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0-preview7"/>
<dependency id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0-preview7"/>
<dependency id="Xamarin.Forms" version="$version$"/>
</group>
<group targetFramework="tizen40">
<dependency id="Tizen.NET" version="4.0.0"/>
</group>
Expand Down
61 changes: 45 additions & 16 deletions .nuspec/Xamarin.Forms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
<dependency id="Xamarin.Android.Support.v7.CardView" version="27.0.2"/>
<dependency id="Xamarin.Android.Support.v7.MediaRouter" version="27.0.2"/>
</group>
<group targetFramework="MonoAndroid90">
<dependency id="Xamarin.Android.Support.v4" version="28.0.0-preview7"/>
<dependency id="Xamarin.Android.Support.Design" version="28.0.0-preview7"/>
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0-preview7"/>
<dependency id="Xamarin.Android.Support.v7.CardView" version="28.0.0-preview7"/>
<dependency id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0-preview7"/>
</group>
<group targetFramework="uap10.0">
<dependency id="NETStandard.Library" version="2.0.1"/>
<dependency id="Microsoft.NETCore.UniversalWindowsPlatform" version="6.0.12" />
Expand All @@ -41,13 +48,20 @@
<reference file="Xamarin.Forms.Xaml.dll" />
<reference file="Xamarin.Forms.Platform.iOS.dll" />
</group>
<group targetFramework="MonoAndroid10">
<group targetFramework="MonoAndroid90">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
<reference file="Xamarin.Forms.Xaml.dll" />
<reference file="FormsViewGroup.dll" />
<reference file="Xamarin.Forms.Platform.Android.dll" />
</group>
</group>
<group targetFramework="MonoAndroid81">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
<reference file="Xamarin.Forms.Xaml.dll" />
<reference file="FormsViewGroup.dll" />
<reference file="Xamarin.Forms.Platform.Android.dll" />
</group>
<group targetFramework="uap10.0">
<reference file="Xamarin.Forms.Core.dll" />
<reference file="Xamarin.Forms.Platform.dll" />
Expand Down Expand Up @@ -126,8 +140,10 @@
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\netstandard1.0\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\netstandard1.0\Design" />

<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid10\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid10\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid90\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid90\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\MonoAndroid81\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\MonoAndroid81\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\Xamarin.iOS10\Design" />
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\uap10.0\Design" />
Expand All @@ -137,18 +153,31 @@
<file src="..\Xamarin.Forms.Core.Design\bin\$Configuration$\Xamarin.Forms.Core.Design.dll" target="lib\tizen40\Design" />
<file src="..\Xamarin.Forms.Xaml.Design\bin\$Configuration$\Xamarin.Forms.Xaml.Design.dll" target="lib\tizen40\Design" />

<!--Android-->
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid10" />
<file src="..\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid10" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid10" />
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid10" />
<file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid10" />
<!--Android 81-->
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid81\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid81" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid81\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid81" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid81" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid81" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid81" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid81" />
<file src="..\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid81" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid81" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid81" />
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid81" />
<file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid81\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid81" />

<!--Android 90-->
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.Android.*pdb" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Platform.Android.FormsViewGroup\bin\$Configuration$\FormsViewGroup.*pdb" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\MonoAndroid90" />
<file src="..\docs\Xamarin.Forms.Core.xml" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\MonoAndroid90" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\MonoAndroid90" />
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\MonoAndroid90" />
<file src="..\Stubs\Xamarin.Forms.Platform.Android\bin\$Configuration$\MonoAndroid90\Xamarin.Forms.Platform.dll" target="lib\MonoAndroid90" />

<!--iPhone Unified-->
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="lib\Xamarin.iOS10" />
Expand Down
18 changes: 15 additions & 3 deletions EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidTargetFrameworkVersion Condition="$(AndroidTargetFrameworkVersion) == ''">v9.0</AndroidTargetFrameworkVersion>
<TargetFrameworkVersion>$(AndroidTargetFrameworkVersion)</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
Expand Down Expand Up @@ -109,9 +110,20 @@
<ItemGroup>
<AndroidEnvironment Include="environment.txt" />
</ItemGroup>
<ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v9.0' ">
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
<Version>28.0.0-preview7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v8.1' ">
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
<Version>27.0.2.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
Expand Down
4 changes: 2 additions & 2 deletions EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Embedding.Droid.Embedding.Droid" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="16" />
<application android:label="Embedding.Droid"></application>
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
<application android:label="Embedding.Droid"></application>
</manifest>
5 changes: 5 additions & 0 deletions EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,10 @@
<Name>Xamarin.Forms.Platform.iOS (Forwarders)</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.iOS.MaterialComponents">
<Version>60.1.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
96 changes: 72 additions & 24 deletions PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidTargetFrameworkVersion Condition="$(AndroidTargetFrameworkVersion) == ''">v9.0</AndroidTargetFrameworkVersion>
<TargetFrameworkVersion>$(AndroidTargetFrameworkVersion)</TargetFrameworkVersion>
<AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
<AndroidStoreUncompressedFileExtensions />
<MandroidI18n />
Expand Down Expand Up @@ -265,65 +266,112 @@
<PackageReference Include="System.Xml.XDocument">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Arch.Core.Common">
<Version>1.0.0</Version>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v9.0' ">
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Arch.Lifecycle.Common">
<Version>1.0.3</Version>
<PackageReference Include="Xamarin.Android.Support.Annotations">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
<Version>1.0.3</Version>
<PackageReference Include="Xamarin.Android.Support.Compat">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Core.UI">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Core.Utils">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.CustomTabs">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Design">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Fragment">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Media.Compat">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Transition">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.CardView">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.Palette">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
<Version>28.0.0-preview7</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable">
<Version>28.0.0-preview7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkVersion)' == 'v8.1' ">
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Annotations">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Compat">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Core.UI">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Core.Utils">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.CustomTabs">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Design">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Fragment">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Media.Compat">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Transition">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.CardView">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.Palette">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable">
<Version>27.0.2</Version>
<Version>27.0.2.1</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
Expand Down
2 changes: 1 addition & 1 deletion PagesGallery/PagesGallery.Droid/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="15" />
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="28" />
<application></application>
</manifest>
2 changes: 1 addition & 1 deletion PagesGallery/PagesGallery.iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>MinimumOSVersion</key>
<string>6.0</string>
<string>8.0</string>
<key>CFBundleDisplayName</key>
<string>PagesGallery</string>
<key>CFBundleIdentifier</key>
Expand Down
1 change: 1 addition & 0 deletions PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="Xamarin.iOS.MaterialComponents" Version="60.1.0" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

Expand Down
Loading