chore: fixing white spaces + updating docs

unoplatform · Sep 14, 2024 · 9f95f9e · 9f95f9e
1 parent 8c7d05e
commit 9f95f9e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/doc/controls/NavigationBar.md b/doc/controls/NavigationBar.md
@@ -312,8 +312,13 @@ If no `MainCommand` is provided in the XAML, the `NavigationBar` will render the
 
 On **Android**, only icons are supported (`AppBarButton.Icon`). This is due to a platform limitation, which can be explained by the fact that `NavigationBar.Content` is left-aligned.
 
-> [!WARNING]
-> Due to [platform limitations](https://github.com/microsoft/microsoft-ui-xaml/issues/1494) on Windows only, a default back button icon is not provided out of the box. You will need to provide your own icon on each instance of the `NavigationBar` where you want to display a back button. On Android and iOS, the native default back button icon is used. On all other platforms, a back button icon is bundled in the default styles for the `NavigationBar`.
+> [!NOTE]
+> The default back button icon can be customized for non-mobile platforms by overriding the `NavigationBarBackIconData` resource. On `Android` and `iOS`, the native default back button icon is used. On Windows and other non-mobile platforms, you can provide a custom back button icon by defining the `NavigationBarBackIconData` resource in your resource dictionary:
+>```xml
+><Application.Resources>
+>    <x:String x:Key="NavigationBarBackIconData">YOUR_CUSTOM_PATH_DATA</x:String>
+></Application.Resources> 
+>```
 
 ### MainCommand Properties
 
@@ -414,6 +419,7 @@ Only supports `BitmapImage` on iOS/Android
 | `NavigationBarFontFamily`                                              | `FontFamily`      | TitleLargeFontFamily                    |
 | `NavigationBarFontWeight`                                              | `String`          | TitleLargeFontWeight                    |
 | `NavigationBarFontSize`                                                | `Double`          | TitleLargeFontSize                      |
+| `NavigationBarBackIconData`                                            | `String`          | NavigationBarBackIconData               |
 | `MaterialModalNavigationBarMainCommandForeground`                      | `SolidColorBrush` | OnSurfaceBrush                          |
 | `MaterialModalNavigationBarForeground`                                 | `SolidColorBrush` | OnSurfaceBrush                          |
 | `MaterialModalNavigationBarBackground`                                 | `SolidColorBrush` | SurfaceBrush                            |

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml
@@ -178,7 +178,7 @@
 
 	<!--#region Default Material NavigationBar-->
 	<Style x:Key="MaterialMainCommandStyle"
-       TargetType="AppBarButton">
+		   TargetType="AppBarButton">
 		<Setter Property="Background" Value="{ThemeResource AppBarButtonBackground}" />
 		<Setter Property="Foreground" Value="{ThemeResource AppBarButtonForeground}" />
 		<Setter Property="BorderBrush" Value="{ThemeResource AppBarButtonBorderBrush}" />
@@ -195,11 +195,11 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="AppBarButton">
 					<um:Ripple Feedback="{TemplateBinding Foreground}"
-                           FeedbackOpacity="{StaticResource PressedOpacity}"
-                           MinWidth="{TemplateBinding MinWidth}"
-                           MaxWidth="{TemplateBinding MaxWidth}">
+							   FeedbackOpacity="{StaticResource PressedOpacity}"
+							   MinWidth="{TemplateBinding MinWidth}"
+							   MaxWidth="{TemplateBinding MaxWidth}">
 						<Grid x:Name="Root"
-                          Background="Transparent">
+							  Background="Transparent">
 							<VisualStateManager.VisualStateGroups>
 								<VisualStateGroup x:Name="CommonStates">
 									<VisualState x:Name="Normal" />
@@ -228,14 +228,14 @@
 							</VisualStateManager.VisualStateGroups>
 
 							<Border x:Name="AppBarButtonInnerBorder"
-                                Margin="{ThemeResource AppBarButtonInnerBorderMargin}"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Control.IsTemplateFocusTarget="True" />
+									Margin="{ThemeResource AppBarButtonInnerBorderMargin}"
+									Background="{TemplateBinding Background}"
+									BorderBrush="{TemplateBinding BorderBrush}"
+									BorderThickness="{TemplateBinding BorderThickness}"
+									Control.IsTemplateFocusTarget="True" />
 
 							<Grid x:Name="ContentRoot"
-                              MinHeight="{ThemeResource AppBarThemeMinHeight}">
+								  MinHeight="{ThemeResource AppBarThemeMinHeight}">
 
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="*" />
@@ -248,9 +248,9 @@
 								</Grid.RowDefinitions>
 
 								<PathIcon Data="{Binding Path=Content, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Foreground="{TemplateBinding Foreground}"
-                                      HorizontalAlignment="Center"
-                                      VerticalAlignment="Center" />
+										  Foreground="{TemplateBinding Foreground}"
+										  HorizontalAlignment="Center"
+										  VerticalAlignment="Center" />
 							</Grid>
 						</Grid>
 					</um:Ripple>