Merge pull request #22 from leealsheikh/Fix/DynamicResources

IeuanWalker · May 12, 2020 · e518b16 · e518b16
2 parents 1d3593b + d0a9b5e
commit e518b16
Show file tree

Hide file tree

Showing 23 changed files with 324 additions and 272 deletions.
diff --git a/Breadcrumb/Breadcrumb.csproj b/Breadcrumb/Breadcrumb.csproj
@@ -33,7 +33,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageId>Xamarin.Forms.Breadcrumb</PackageId>
-    <Version>2.4.0</Version>
+    <Version>2.5.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Breadcrumb/Breadcrumb.xaml b/Breadcrumb/Breadcrumb.xaml
@@ -2,11 +2,10 @@
 <ContentView x:Class="Breadcrumb.Breadcrumb"
              xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Name="this"
              IsVisible="False">
     <ContentView.Content>
         <ScrollView x:Name="BreadCrumbsScrollView"
-                    HorizontalScrollBarVisibility="{Binding ScrollBarVisibility, Source={x:Reference this}}"
+                    HorizontalScrollBarVisibility="{Binding ScrollBarVisibility, Source={RelativeSource AncestorType={x:Type ContentView}}}"
                     Orientation="Horizontal">
             <StackLayout x:Name="BreadCrumbContainer"
                          HorizontalOptions="FillAndExpand"

diff --git a/Breadcrumb/Breadcrumb.xaml.cs b/Breadcrumb/Breadcrumb.xaml.cs
@@ -148,6 +148,8 @@ public Breadcrumb()
                             Source = Separator,
                             VerticalOptions = LayoutOptions.Center
                         });
+
+
                         continue;
                     }
 
@@ -198,27 +200,33 @@ private PancakeView BreadCrumbLabelCreator(Page page, bool isLast, bool isFirst)
             }
             else
             {
-                stackLayout.Children.Add(new Label
+                Label breadcrumbText = new Label
                 {
                     Text = page.Title,
                     FontSize = 15,
-                    TextColor = isLast ? LastBreadcrumbTextColor : TextColor,
                     VerticalOptions = LayoutOptions.Center,
                     VerticalTextAlignment = TextAlignment.Center
-                });
+                };
+                breadcrumbText.SetBinding(Label.TextColorProperty, new Binding(isLast ? nameof(LastBreadcrumbTextColor) : nameof(TextColor), source: new RelativeBindingSource(RelativeBindingSourceMode.FindAncestor, typeof(Breadcrumb))));
+
+                stackLayout.Children.Add(breadcrumbText);
             }
 
 
             // Create PancakeView, and add StackLayout containing the selectedPage title
-            return new PancakeView
+            PancakeView container = new PancakeView
             {
                 Padding = 10,
                 VerticalOptions = LayoutOptions.Center,
                 CornerRadius = isLast ? LastBreadcrumbCornerRadius : CornerRadius,
-                BackgroundColor = isLast ? LastBreadcrumbBackgroundColor : BreadcrumbBackgroundColor,
                 Content = stackLayout,
                 Margin = BreadcrumbMargin
             };
+            container.SetBinding(PancakeView.BackgroundColorProperty, new Binding(isLast ? nameof(LastBreadcrumbBackgroundColor) : nameof(BreadcrumbBackgroundColor), source: new RelativeBindingSource(RelativeBindingSourceMode.FindAncestor, typeof(Breadcrumb))));
+
+
+
+            return container;
         }
 
         /// <summary>

diff --git a/DemoApp/DemoApp.Android/MainActivity.cs b/DemoApp/DemoApp.Android/MainActivity.cs
@@ -1,14 +1,13 @@
 using Android.App;
 using Android.Content.PM;
 using Android.OS;
-using Android.Runtime;
-using Xamarin.Essentials;
 using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
 
 namespace DemoApp.Droid
 {
     [Activity(Label = "DemoApp", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
-    public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+    public class MainActivity : FormsAppCompatActivity
     {
         protected override void OnCreate(Bundle savedInstanceState)
         {
@@ -18,16 +17,8 @@ protected override void OnCreate(Bundle savedInstanceState)
             base.OnCreate(savedInstanceState);
 
             Forms.SetFlags("Shell_Experimental", "Visual_Experimental", "CollectionView_Experimental", "FastRenderers_Experimental");
-            Platform.Init(this, savedInstanceState);
             Forms.Init(this, savedInstanceState);
             LoadApplication(new App());
         }
-
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults)
-        {
-            Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-
-            base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-        }
     }
 }