diff --git a/DemoApp/DemoApp.Android/Resources/Resource.designer.cs b/DemoApp/DemoApp.Android/Resources/Resource.designer.cs
index 24aa92d..1bc8382 100644
--- a/DemoApp/DemoApp.Android/Resources/Resource.designer.cs
+++ b/DemoApp/DemoApp.Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@ namespace DemoApp.Droid
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.0.155")]
public partial class Resource
{
diff --git a/DemoApp/DemoApp.iOS/DemoApp.iOS.csproj b/DemoApp/DemoApp.iOS/DemoApp.iOS.csproj
index 85400fb..c268623 100644
--- a/DemoApp/DemoApp.iOS/DemoApp.iOS.csproj
+++ b/DemoApp/DemoApp.iOS/DemoApp.iOS.csproj
@@ -58,8 +58,9 @@
prompt
4
ARM64
- iPhone Developer
+ Apple Development: Ieuan Walker (R4SVVV33HW)
Entitlements.plist
+ VS: WildCard Development
diff --git a/DemoApp/DemoApp/Pages/BasePage.xaml b/DemoApp/DemoApp/Pages/BasePage.xaml
index 21eb3ff..fe5c1f4 100644
--- a/DemoApp/DemoApp/Pages/BasePage.xaml
+++ b/DemoApp/DemoApp/Pages/BasePage.xaml
@@ -2,7 +2,7 @@
@@ -12,14 +12,34 @@
-
+
+
+
+
+
+
+
+
-
+
-
+
@@ -50,7 +70,7 @@
-
+
@@ -58,7 +78,7 @@
-
+
@@ -66,7 +86,7 @@
-
+
-
+
diff --git a/Settings.XamlStyler b/Settings.XamlStyler
new file mode 100644
index 0000000..36657ca
--- /dev/null
+++ b/Settings.XamlStyler
@@ -0,0 +1,41 @@
+{
+ "AttributesTolerance": 2,
+ "KeepFirstAttributeOnSameLine": true,
+ "MaxAttributeCharactersPerLine": 0,
+ "MaxAttributesPerLine": 1,
+ "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransfom, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
+ "SeparateByGroups": false,
+ "AttributeIndentation": 0,
+ "AttributeIndentationStyle": 1,
+ "RemoveDesignTimeReferences": false,
+ "EnableAttributeReordering": true,
+ "AttributeOrderingRuleGroups": [
+ "x:Class",
+ "xmlns, xmlns:x",
+ "xmlns:*",
+ "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+ "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
+ "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
+ "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+ "*:*, *",
+ "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+ "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
+ "Storyboard.*, From, To, Duration"
+ ],
+ "FirstLineAttributes": "",
+ "OrderAttributesByName": true,
+ "PutEndingBracketOnNewLine": false,
+ "RemoveEndingTagOfEmptyElement": true,
+ "SpaceBeforeClosingSlash": true,
+ "RootElementLineBreakRule": 0,
+ "ReorderVSM": 2,
+ "ReorderGridChildren": false,
+ "ReorderCanvasChildren": false,
+ "ReorderSetters": 0,
+ "FormatMarkupExtension": true,
+ "NoNewLineMarkupExtensions": "x:Bind, Binding",
+ "ThicknessSeparator": 2,
+ "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
+ "FormatOnSave": true,
+ "CommentPadding": 1
+}
\ No newline at end of file
diff --git a/Src/Breadcrumb.Android/Resources/Resource.designer.cs b/Src/Breadcrumb.Android/Resources/Resource.designer.cs
index e10e933..db66a70 100644
--- a/Src/Breadcrumb.Android/Resources/Resource.designer.cs
+++ b/Src/Breadcrumb.Android/Resources/Resource.designer.cs
@@ -14,7 +14,7 @@ namespace Breadcrumb.Android
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.0.155")]
public partial class Resource
{
diff --git a/Src/Breadcrumb/Breadcrumb.xaml.cs b/Src/Breadcrumb/Breadcrumb.xaml.cs
index dc1c468..606b054 100644
--- a/Src/Breadcrumb/Breadcrumb.xaml.cs
+++ b/Src/Breadcrumb/Breadcrumb.xaml.cs
@@ -151,7 +151,7 @@ public Breadcrumb()
if (!page.Equals(pages.LastOrDefault()))
{
// Create breadcrumb
- Frame breadCrumb1 = BreadCrumbLabelCreator(page, false, page.Equals(pages.FirstOrDefault()));
+ PancakeView breadCrumb1 = BreadCrumbLabelCreator(page, false, page.Equals(pages.FirstOrDefault()));
// Add tap gesture
if (IsNavigationEnabled)
@@ -184,7 +184,7 @@ public Breadcrumb()
BreadCrumbContainer.ChildAdded += AnimatedStack_ChildAdded;
// Create selectedPage title label
- Frame breadCrumb2 = BreadCrumbLabelCreator(page, true, page.Equals(pages.FirstOrDefault()));
+ PancakeView breadCrumb2 = BreadCrumbLabelCreator(page, true, page.Equals(pages.FirstOrDefault()));
// Move BreadCrumb of selectedPage to start the animation
breadCrumb2.TranslationX = Application.Current.MainPage.Width;
@@ -208,7 +208,7 @@ public Breadcrumb()
///
///
///
- private Frame BreadCrumbLabelCreator(Page page, bool isLast, bool isFirst)
+ private PancakeView BreadCrumbLabelCreator(Page page, bool isLast, bool isFirst)
{
// Create StackLayout to contain the label within a PancakeView
StackLayout stackLayout = new()
@@ -242,27 +242,28 @@ private Frame BreadCrumbLabelCreator(Page page, bool isLast, bool isFirst)
stackLayout.Children.Add(breadcrumbText);
}
+
+
+ Frame accessibilityContainer = !isLast && IsNavigationEnabled ? new BreadcrumbButton() : new Frame();
+ accessibilityContainer.HasShadow = false;
+ accessibilityContainer.BackgroundColor = Color.Transparent;
+ accessibilityContainer.Padding = 10;
+ accessibilityContainer.VerticalOptions = LayoutOptions.Center;
+ accessibilityContainer.Content = stackLayout;
+
PancakeView container = new PancakeView
{
- Padding = 10,
- VerticalOptions = LayoutOptions.Center,
CornerRadius = isLast ? LastBreadcrumbCornerRadius : CornerRadius,
- Content = stackLayout,
+ Content = accessibilityContainer,
Margin = BreadcrumbMargin
};
container.SetBinding(BackgroundColorProperty, new Binding(isLast ? nameof(LastBreadcrumbBackgroundColor) : nameof(BreadcrumbBackgroundColor), source: new RelativeBindingSource(RelativeBindingSourceMode.FindAncestor, typeof(Breadcrumb))));
- Frame accessibilityContainer = !isLast && IsNavigationEnabled ? new BreadcrumbButton() : new Frame();
- accessibilityContainer.HasShadow = false;
- accessibilityContainer.BackgroundColor = Color.Transparent;
- accessibilityContainer.Padding = 0;
- accessibilityContainer.Content = container;
-
AutomationProperties.SetIsInAccessibleTree(accessibilityContainer, true);
AutomationProperties.SetName(accessibilityContainer, page.Title);
- return accessibilityContainer;
+ return container;
}
///