Some small updates - flyout text color being one

IsaacMorris1980 · Aug 26, 2022 · f3c6fc6 · f3c6fc6
1 parent 2d110ac
commit f3c6fc6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -366,3 +366,4 @@ MigrationBackup/
 FodyWeavers.xsd
 /Resources/Raw/krogerapiconfig.json
 /ShoppingList/Resources/Raw/krogerapiconfig.json
+/ShoppingList/Resources/Raw/krogerapiconfig-test.json
diff --git a/ShoppingList/AppShell.xaml b/ShoppingList/AppShell.xaml
@@ -9,6 +9,7 @@
     Shell.FlyoutBehavior="Flyout"
     FlyoutBackgroundColor="{DynamicResource Secondary}"
     Shell.TitleColor="{DynamicResource Accent}"
+    Shell.ForegroundColor="{DynamicResource Accent}"
     >
 
     <ShellContent

diff --git a/ShoppingList/Controls/CircularButton.cs b/ShoppingList/Controls/CircularButton.cs
@@ -35,7 +35,7 @@ public string Image
 	public static BindableProperty ButtonColorProperty = BindableProperty.Create(
 		nameof(ButtonColor), typeof(Color), typeof(CircularButton), propertyChanged: OnButtonColorChanged);
 
-	public BindableProperty ImageProperty = BindableProperty.Create(
+	public static BindableProperty ImageProperty = BindableProperty.Create(
 		nameof(Image), typeof(string), typeof(CircularButton), propertyChanged: OnImageChanged);
 
 	public static new BindableProperty IsVisibleProperty = BindableProperty.Create(

diff --git a/ShoppingList/Resources/Styles/Styles.xaml b/ShoppingList/Resources/Styles/Styles.xaml
@@ -46,7 +46,7 @@
     </Style>
 
     <Style TargetType="CheckBox">
-        <Setter Property="Color" Value="{AppThemeBinding Light={DynamicResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="Color" Value="{AppThemeBinding Light={DynamicResource Accent}, Dark={DynamicResource Accent}}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
@@ -169,6 +169,9 @@
         <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
     </Style>
 
+    <Style Class="FlyoutItemLabelStyle" TargetType="Label">
+        <Setter Property="TextColor" Value="{DynamicResource Accent}" />
+    </Style>
 
     <Style TargetType="Picker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />

diff --git a/ShoppingList/View/UserListDetails.xaml b/ShoppingList/View/UserListDetails.xaml
@@ -52,7 +52,7 @@
                         </SwipeView.RightItems>
                             <Frame Grid.ColumnSpan="3"
                                Padding="5"
-                               Margin="10,0,0,10"
+                               Margin="10,0,10,05"
                                x:Name="ItemFrame"
                                BackgroundColor="{DynamicResource Tertiary}"
                                BindingContext="{Binding .}">