Skip to content

Commit

Permalink
chore: material default back arrow
Browse files Browse the repository at this point in the history
chore: TemplateBind the Data to the Content prop

chore: fixing white spaces + updating docs

docs: fixing linter error

chore: bump Uno.Material to 5.3.0-dev.4

chore: material default back arrow

chore: TemplateBind the Data to the Content prop

chore: fixing white spaces + updating docs

docs: fixing linter error

chore: Uno.Material.WinUI 5.3.0-dev.4

chore: material default back arrow

chore: TemplateBind the Data to the Content prop

chore: fixing white spaces + updating docs

docs: fixing linter error

chore: bump Uno.Material to 5.3.0-dev.4

docs: fixing linter error

chore: Uno.Material.WinUI 5.3.0-dev.4

chore: undo material bump

chore: bump sample packages

chore: remove content setter
  • Loading branch information
Kunal22shah authored and kazo0 committed Sep 22, 2024
1 parent c17a158 commit 5b80d9b
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 58 deletions.
11 changes: 9 additions & 2 deletions doc/controls/NavigationBar.md
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,14 @@ 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
Expand Down Expand Up @@ -414,6 +420,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 |
Expand Down
8 changes: 4 additions & 4 deletions samples/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
<PackageVersion Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageVersion Include="Uno.Cupertino" Version="4.2.0-dev.17" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="4.2.0-dev.17" />
<PackageVersion Include="Uno.Cupertino" Version="5.3.0-dev.4" />
<PackageVersion Include="Uno.Cupertino.WinUI" Version="5.3.0-dev.4" />
<PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.8.0-dev.1" />
<PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.8.0-dev.1" />
<PackageVersion Include="Uno.Material" Version="4.2.0-dev.17" />
<PackageVersion Include="Uno.Material.WinUI" Version="4.2.0-dev.17" />
<PackageVersion Include="Uno.Material" Version="5.3.0-dev.4" />
<PackageVersion Include="Uno.Material.WinUI" Version="5.3.0-dev.4" />
<PackageVersion Include="Uno.UI" Version="5.4.0-dev.738" />
<PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.4.0-dev.738" />
<PackageVersion Include="Uno.UI.RemoteControl" Version="5.4.0-dev.738" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<CupertinoToolkitResources xmlns="using:Uno.Toolkit.UI.Cupertino" />

<!-- Load application resources -->
<ResourceDictionary Source="Converters.xaml" />
<ResourceDictionary Source="ms-appx:///Converters.xaml" />
<ResourceDictionary Source="ms-appx:///Styles/Application/Colors.xaml" />
<ResourceDictionary Source="ms-appx:///Styles/Application/Fonts.xaml" />
<ResourceDictionary Source="ms-appx:///Styles/Button.xaml" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
<utu:NavigationBar.MainCommand>
<AppBarButton Label="Close"
Click="NavigateBack"
AutomationProperties.AutomationId="M3_NavBar_Close_Button"
Style="{StaticResource MaterialAppBarButtonStyle}">
AutomationProperties.AutomationId="M3_NavBar_Close_Button">
<AppBarButton.Icon>
<BitmapIcon UriSource="ms-appx:///Assets/CloseIcon.png" />
</AppBarButton.Icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -583,4 +583,4 @@
<Content Include="$(MSBuildThisFileDirectory)Assets\Media\SmallMedia.scale-400.png" />
<Content Include="$(MSBuildThisFileDirectory)Assets\UnoLogo.png" />
</ItemGroup>
</Project>
</Project>
Loading

0 comments on commit 5b80d9b

Please sign in to comment.