Merge branch 'main' of https://github.com/akgulebubekir/Maui.DataGrid …

…into net9
akgulebubekir · Nov 20, 2024 · 8e0ae56 · 8e0ae56
2 parents bef1876 + 344ae22
commit 8e0ae56
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 5 deletions.
diff --git a/Maui.DataGrid.Sample/MainPage.xaml b/Maui.DataGrid.Sample/MainPage.xaml
@@ -21,7 +21,7 @@
                      BorderColor="{StaticResource GridBorderColor}" BorderThickness="{Binding BorderThickness}"
                      HeaderBackground="{StaticResource GridHeaderBgColor}" HeaderBordersVisible="{Binding HeaderBordersVisible}"
                      BackgroundColor="{StaticResource GridBgColor}" ActiveRowColor="{StaticResource ActiveRowColor}"
-                     FooterBackground="{StaticResource GridFooterBgColor}" SortedColumnIndex="1"
+                     FooterBackground="{StaticResource GridFooterBgColor}" FooterTextColor="{StaticResource GridFooterTextColor}" SortedColumnIndex="1"
                      PaginationEnabled="{Binding PaginationEnabled}" PageSize="{Binding PageSize}" PageText="{Binding PaginationText}" PerPageText="{Binding PerPageText}"
                      PullToRefreshCommand="{Binding Commands[Refresh]}" IsRefreshing="{Binding IsRefreshing}"
                      RowHeight="70" HeaderHeight="75" x:Name="_dataGrid1"

diff --git a/Maui.DataGrid.Sample/Resources/Styles/Colors.xaml b/Maui.DataGrid.Sample/Resources/Styles/Colors.xaml
@@ -44,6 +44,7 @@
     <Color x:Key="ActiveRowColor">#8899AA</Color>
     <Color x:Key="GridHeaderBgColor">#E0E6F8</Color>
     <Color x:Key="GridFooterBgColor">#E0E6F8</Color>
+    <Color x:Key="GridFooterTextColor">#404040</Color>
     <Color x:Key="GridBorderColor">#CCCCCC</Color>
     <Color x:Key="GridBgColor">#CCCCCC</Color>
 </ResourceDictionary>
diff --git a/Maui.DataGrid/CompatibilitySuppressions.xml b/Maui.DataGrid/CompatibilitySuppressions.xml
@@ -29,6 +29,13 @@
     <Right>lib/net8.0/Maui.DataGrid.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>F:Maui.DataGrid.DataGrid.FooterTextColorProperty</Target>
+    <Left>lib/net8.0/Maui.DataGrid.dll</Left>
+    <Right>lib/net8.0/Maui.DataGrid.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>F:Maui.DataGrid.DataGrid.HeaderFilterStyleProperty</Target>
@@ -78,6 +85,13 @@
     <Right>lib/net8.0/Maui.DataGrid.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Maui.DataGrid.DataGrid.get_FooterTextColor</Target>
+    <Left>lib/net8.0/Maui.DataGrid.dll</Left>
+    <Right>lib/net8.0/Maui.DataGrid.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Maui.DataGrid.DataGrid.get_HeaderFilterStyle</Target>
@@ -106,6 +120,13 @@
     <Right>lib/net8.0/Maui.DataGrid.dll</Right>
     <IsBaselineSuppression>true</IsBaselineSuppression>
   </Suppression>
+  <Suppression>
+    <DiagnosticId>CP0002</DiagnosticId>
+    <Target>M:Maui.DataGrid.DataGrid.set_FooterTextColor(Microsoft.Maui.Graphics.Color)</Target>
+    <Left>lib/net8.0/Maui.DataGrid.dll</Left>
+    <Right>lib/net8.0/Maui.DataGrid.dll</Right>
+    <IsBaselineSuppression>true</IsBaselineSuppression>
+  </Suppression>
   <Suppression>
     <DiagnosticId>CP0002</DiagnosticId>
     <Target>M:Maui.DataGrid.DataGrid.set_HeaderFilterStyle(Microsoft.Maui.Controls.Style)</Target>

diff --git a/Maui.DataGrid/DataGrid.xaml b/Maui.DataGrid/DataGrid.xaml
@@ -69,12 +69,12 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <HorizontalStackLayout VerticalOptions="Center" IsVisible="{Binding PageSizeVisible, Source={Reference self}}">
-                <Label Text="{Binding PerPageText, Source={Reference self}}" Margin="5,0,0,0" VerticalTextAlignment="Center" TextColor="Black" />
-                <Picker ItemsSource="{Binding PageSizeList, Source={Reference self}, Mode=TwoWay}" SelectedItem="{Binding PageSize, Source={Reference self}}" TextColor="Black"  MinimumWidthRequest="50" ios:Picker.UpdateMode="WhenFinished"/>
+                <Label Text="{Binding PerPageText, Source={Reference self}}" Margin="5,0,0,0" VerticalTextAlignment="Center" TextColor="{Binding FooterTextColor, Source={Reference self}}" />
+                <Picker ItemsSource="{Binding PageSizeList, Source={Reference self}, Mode=TwoWay}" SelectedItem="{Binding PageSize, Source={Reference self}}" TextColor="{Binding FooterTextColor, Source={Reference self}}"  MinimumWidthRequest="50" ios:Picker.UpdateMode="WhenFinished"/>
             </HorizontalStackLayout>
             <HorizontalStackLayout Grid.Column="2" VerticalOptions="Center">
-                <Label Text="{Binding PageText, Source={Reference self}}" Margin="0,0,5,0" VerticalTextAlignment="Center" TextColor="Black" />
-                <Label Text="{Binding PageNumber, Source={Reference self}}" VerticalTextAlignment="Center" TextColor="Black" />
+                <Label Text="{Binding PageText, Source={Reference self}}" Margin="0,0,5,0" VerticalTextAlignment="Center" TextColor="{Binding FooterTextColor, Source={Reference self}}" />
+                <Label Text="{Binding PageNumber, Source={Reference self}}" VerticalTextAlignment="Center" TextColor="{Binding FooterTextColor, Source={Reference self}}" />
                 <Stepper x:Name="_paginationStepper" Value="{Binding PageNumber, Source={Reference self}}" Style="{Binding PaginationStepperStyle, Source={Reference self}}" Minimum="1" />
             </HorizontalStackLayout>
         </Grid>

diff --git a/Maui.DataGrid/DataGrid.xaml.cs b/Maui.DataGrid/DataGrid.xaml.cs
@@ -61,6 +61,12 @@ public partial class DataGrid
     public static readonly BindableProperty FooterBackgroundProperty =
         BindablePropertyExtensions.Create<DataGrid, Color>(Colors.White);
 
+    /// <summary>
+    /// Gets or sets the text color of the footer.
+    /// </summary>
+    public static readonly BindableProperty FooterTextColorProperty =
+        BindablePropertyExtensions.Create<DataGrid, Color>(Colors.Black);
+
     /// <summary>
     /// Gets or sets the color of the border.
     /// </summary>
@@ -779,6 +785,16 @@ public Color FooterBackground
         set => SetValue(FooterBackgroundProperty, value);
     }
 
+    /// <summary>
+    /// Gets or sets textColor of the footer that contains pagination elements
+    /// Default value is <see cref="Colors.Black"/>.
+    /// </summary>
+    public Color FooterTextColor
+    {
+        get => (Color)GetValue(FooterTextColorProperty);
+        set => SetValue(FooterTextColorProperty, value);
+    }
+
     /// <summary>
     /// Gets or sets border color
     /// Default Value is Black.