added bindable property ButtonColor

IsaacMorris1980 · Aug 17, 2022 · 31e65a4 · 31e65a4
1 parent 78708ee
commit 31e65a4
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/ShoppingList/Controls/CircularButton.cs b/ShoppingList/Controls/CircularButton.cs
@@ -3,12 +3,30 @@ namespace ShoppingList.Controls;
 
 public class CircularButton : GraphicsView, IGraphicsView
 {
-	public new IDrawable Drawable { get; set; }
+	//public static new IDrawable Drawable { get; set; }
+
+	public Color ButtonColor
+	{
+        get => (Color?)GetValue(ButtonColorProperty);
+        set => SetValue(ButtonColorProperty, value);
+    }
+
+	public BindableProperty ButtonColorProperty = BindableProperty.Create(
+		nameof(ButtonColor), typeof(Color), typeof(CircularButton), propertyChanged: OnButtonColorChanged);
 
 	public CircularButton()
 	{
 		var drawable = new ShoppingList.Drawable.CircularButton();
-		this.Drawable = drawable; 
+		Drawable = drawable;
 	}
-}
 
+	static void OnButtonColorChanged(BindableObject bindable, object oldValue, object newValue)
+	{
+        var control = (CircularButton)bindable;
+        var buttonColor = control.ButtonColor;
+		var thisDrawable = control.Drawable as ShoppingList.Drawable.CircularButton;
+		thisDrawable.ButtonColor = buttonColor;
+        control.Invalidate();
+    }
+
+}
diff --git a/ShoppingList/Drawable/CircularButton.cs b/ShoppingList/Drawable/CircularButton.cs
@@ -15,6 +15,8 @@ public class CircularButton : IDrawable
     public int Width { get; set; } = 0;
     public int Height { get; set; } = 0;
 
+    public Color ButtonColor { get; set; } = Colors.White; 
+
     public void Draw(ICanvas canvas, RectF dirtyRect)
     {
         canvas.StrokeColor = StrokeColor;
@@ -41,7 +43,7 @@ public void Draw(ICanvas canvas, RectF dirtyRect)
         }
         if (Image != null)
         {
-            canvas.FillColor = Colors.White; 
+            canvas.FillColor = this.ButtonColor; 
             canvas.FillCircle(centerOfCircle, limitingDim / 2);
             canvas.DrawImage(Image, dirtyRect.X + dirtyRect.Width / 4, dirtyRect.Y + dirtyRect.Height / 4, dirtyRect.Width / 2, dirtyRect.Height / 2); 
         }

diff --git a/ShoppingList/View/UserListDataInput.xaml b/ShoppingList/View/UserListDataInput.xaml
@@ -60,18 +60,19 @@
 
         </StackLayout>
 
-        <Button Text="Create New List"
-                    IsEnabled="True"
-                    Command="{Binding UserListCompletedCommand}"
-                    Margin="8"
-                Grid.Row="1"/>
 
         <Button Text="Cancel"
                     IsEnabled="True"
                     Command="{Binding CancelCommand}"
                     Margin="8"
                 Grid.Row="1"
                 Grid.Column="2"/>
+
+        <Button Text="Create New List"
+                    IsEnabled="True"
+                    Command="{Binding UserListCompletedCommand}"
+                    Margin="8"
+                Grid.Row="1"/>
     </Grid>
 
 

diff --git a/ShoppingList/View/UserListDetails.xaml b/ShoppingList/View/UserListDetails.xaml
@@ -5,7 +5,6 @@
              xmlns:viewmodel="clr-namespace:ShoppingList.ViewModels"
              xmlns:drawables="clr-namespace:ShoppingList.Drawable"
              xmlns:controls="clr-namespace:ShoppingList.Controls"
-             xmlns:skiasharp="clr-namespace:SkiaSharp.Extended.UI.Controls;assembly=SkiaSharp.Extended.UI"
              x:DataType="viewmodel:UserListDetailViewModel"
              x:Class="ShoppingList.UserListDetails"
              Title="{Binding Title}">
@@ -25,6 +24,7 @@
           ColumnSpacing="3"
           RowDefinitions="*">
 
+        <!-- Refresh view doesn't work on iOS yet-->
         <!--<RefreshView Grid.ColumnSpan="3" Command="{Binding RefreshUserListDetailScreenCommand}"
                      CommandParameter="UserListCollectionView"
                      IsRefreshing="{Binding IsRefreshing}"
@@ -91,6 +91,8 @@
                         x:Name="CircularButton"
                         WidthRequest="75"
                         HeightRequest="75"
+                        Margin="15,0,0,0"
+                        ButtonColor="{StaticResource Primary}"
                         BackgroundColor="Transparent"
                         VerticalOptions="End"
                         HorizontalOptions="Start"