From 4733e7db0b10fcaf9cd5405577a171aa25d4f27b Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Fri, 29 Sep 2023 12:23:09 -0400 Subject: [PATCH 1/3] fix: remove nav bar back icon, use symbol/path for non-win/non-mobile --- src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png | Bin 267 -> 0 bytes src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png | Bin 354 -> 0 bytes src/Uno.Toolkit.UI/Assets/BackIcon.scale-200.png | Bin 460 -> 0 bytes src/Uno.Toolkit.UI/Assets/BackIcon.scale-300.png | Bin 623 -> 0 bytes src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png | Bin 788 -> 0 bytes .../Controls/NavigationBar/NavigationBar.xaml | 11 ++++++----- .../Resources/AssetCatalog.UWP.xaml | 4 ---- .../Resources/AssetCatalog.WinUI.xaml | 4 ---- src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj | 1 - src/Uno.Toolkit.UI/xamlmerge-toolkit.props | 1 - .../Assets/MaterialBackIcon.scale-100.png | Bin 269 -> 0 bytes .../Assets/MaterialBackIcon.scale-150.png | Bin 348 -> 0 bytes .../Assets/MaterialBackIcon.scale-200.png | Bin 391 -> 0 bytes .../Assets/MaterialBackIcon.scale-300.png | Bin 519 -> 0 bytes .../Assets/MaterialBackIcon.scale-400.png | Bin 618 -> 0 bytes .../Resources/AssetCatalog.UWP.xaml | 4 ---- .../Resources/AssetCatalog.WinUI.xaml | 4 ---- .../Styles/Controls/v2/NavigationBar.xaml | 11 +++++++---- .../Uno.Toolkit.UI.Material.csproj | 1 - .../Uno.Toolkit.Material/xamlmerge-material.props | 1 - 20 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png delete mode 100644 src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png delete mode 100644 src/Uno.Toolkit.UI/Assets/BackIcon.scale-200.png delete mode 100644 src/Uno.Toolkit.UI/Assets/BackIcon.scale-300.png delete mode 100644 src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png delete mode 100644 src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml delete mode 100644 src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml delete mode 100644 src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png delete mode 100644 src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png delete mode 100644 src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png delete mode 100644 src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png delete mode 100644 src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png delete mode 100644 src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml delete mode 100644 src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png deleted file mode 100644 index 66d08576fc30df68048533836711900fa86cbef6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Y!3HERME&^*q&N#aB8wRqxP?KOkzv*x37{Zj zage(c!@6@aFM%AEbVpxD28NCO+}8u-KbeGdvOBH4B-N*t*gt*s zCQaoxJhxm5KGk%7;jUbmzVl{f>a4eMzPWLdDUbOVh&?shHCwKLyG?sWeEcGyTNylE L{an^LB{Ts5fp}ow diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png deleted file mode 100644 index 0c57081d2e27c2ad728c17e4adc9d60b31c02574..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZJ!3HFi4*019Db50q$YKTtfjJ<|sCL%M1SrT@ z9OUlAuaUS9Su%&(9N!7ilRnKqDtWKS^BH+pIe{yB9*F80r zxGRJ8ju!4QIVLm1@`#YNs`t!|+zqC_%;%Zj9MwB|xJT#c7rQf7bMzafHY|70z2Uq- z?G4`wUTKEd0}HnCE!K$I-QcLRVXDaIyn+*RIKTMBhlGYo$}oIrdFOb_=}On4hzcg| z6AODLm^0n|#&7C$YwKY%Z`C!K@~dW<%q{ema|ksq-FK**b?*MkZ0Gvt%-5Rw_yQ~E x$uEr&GSq*|Z7;J(%{Nz8X##spoyUG5Wd@~8~ zp!f~Dz&=4ICd;y?G)>oW9M6*^>DspaAOnf$gfJ$GqLozYs;Y{~KxU+w5e)Tx-;tqc zfyOYuS(2eBgYrCIjA3whUh2ADk)bHfA;w@+kY$V#$R%bHY=#3L~BN*WPA$)xaQQ zU+Oc%OPJ+uQWw}Ph8Osl)Pnz-rdeYd%D6k}+%H^oONsw!l638V=ySGR8`V7R|pzN== z=Z=Fr54mQtw^trAIT)S|hUpW#x42tedgU5jV!i>WeBp{1AW;$k0000NAma0@LW8AhgeooM90cpY`MI4aQjuJ5$spWF{MH)GID9TDrr_(3W$VpA-m~B$b!J#NA z^=^_BQz#}Q1qP7nkzwQxMOi6qZ2M#&nPRp}F?(VzNHIHNu1GOkF_)y6wU}#CjF6PF zg@n@J$Vc$<2B{9Y!8SM&h{<9!>f{!QvM|RqSnQu1gE!>fVzKDrCL%ZB#bdp9EwkMB zvDysC64nuS0&2C|2x5=8@)nW~RvSW0{Yw_G&F)>3+bK%8B)3;>aYZh(jO2n`Zhg#l zxx&Jq&2k4TnzqWR4orvm*YA=6l*;aHk~^j-VTD}jQv;hh=XqWS&6})eAl(jvAdKU9 zL>J=Rg};mSoQ_iMMdWl9*R{)?d@=`9ZeFcczcJ??s9?_NKAEE=^N6A-!JGI!6~_$E zq!DFdj-;G6l%`Zga=K6EC_nwSnRA#|*SK!+)f`fvCKd;+WCc$>QQEj~FvI`=002ov JPDHLkV1n7c4)p*4 diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png deleted file mode 100644 index 9b1418b5f95fd2617426e95ed39a8c217b40bfb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 788 zcmV+v1MB>WP)@~0drDELIAGL9O(c600d`2O+f$vv5yPrlJvcwsXunGmT#KBJb zD+#MGpmw``WP`&~{YN#^JmVbm8$LIDd4e+18KlPJ5BSQPUlnu4zeCWz~P%Slh?j=9ApKg z4F?$mX~aQBKw5E7CXi+vv=vA@4%!Ihaqe0R_T)&~28SCmj<^$jd3Qg8 zY;pJtc8r{u94`T~#L-Zn2f!D6Is!g5bHe))ai@F*lw2ziGR`si)|Ff^Ug`U0@&dgM8~st`&%;)9Jrvvx({cfP4tMoWG3oDVgTeNBLOjjBid2 z|B0Fd#VFmFOeTGck@PMM!^3K|`YVp(8*;el@g0x!vgr8(wn%*X=X0%AyI>?IKW@>w z2W^lTsLp>!t|CR7p72O_McbbANEtv#J5nYP(u`yTgtQ_V10jt_RzOG_k~I+0gtQY7 zS|MHY=3&-r-!f7j7jd5On>YH>U)@EVX)Yt>c_F!zNO>ZYQ>$T}2K&#an@S(#M39Ha`^Q)2coy?bH>RLBH9*@tlV2;er-s)U8 zkJW@0NIKWeTOx_7v|nB@L>iE=O8xDQ3?yCa<~Ic-%vQYFUp)k@zQh^KXV5L*$4`PZ S;zFhX0000 + mc:Ignorable="android ios mobile not_win"> @@ -40,10 +41,10 @@ diff --git a/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml b/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml deleted file mode 100644 index 0b1e70ad0..000000000 --- a/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml +++ /dev/null @@ -1,4 +0,0 @@ - - ms-appx:///Uno.Toolkit.UI/Assets/BackIcon.png - diff --git a/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml b/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml deleted file mode 100644 index 65e2ecb4a..000000000 --- a/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml +++ /dev/null @@ -1,4 +0,0 @@ - - ms-appx:///Uno.Toolkit.WinUI/Assets/BackIcon.png - diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj index 8205850d3..bdef91394 100644 --- a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj +++ b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj @@ -48,7 +48,6 @@ - diff --git a/src/Uno.Toolkit.UI/xamlmerge-toolkit.props b/src/Uno.Toolkit.UI/xamlmerge-toolkit.props index 0eb457819..433bc03fe 100644 --- a/src/Uno.Toolkit.UI/xamlmerge-toolkit.props +++ b/src/Uno.Toolkit.UI/xamlmerge-toolkit.props @@ -6,7 +6,6 @@ - diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png deleted file mode 100644 index 74435a88c51c3e6e5ef4f8e629d3d87811149056..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{vuBo$B+ufr~Mmw4;cu!o{w=BZjOF)p!WcW zWFv2auo0iG^aQ~h3|vd5^yyxdTIbNz;j%IKS@gCim-jBWZkabjR5n$O`}u6Hq{AC7 z&OQ*HeM{|drC+;5S=WXH2^S4T!_D6X4a|-O{ESRon<;--$^P8U?ih`EOE?&IFAdp# z?Dp$~gA$x|^+75(^p1Fah~KDt^4Y65^S8k diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png deleted file mode 100644 index 523e0b6eb0e37e01ec7b9f09c38a1ccfc6f9e25a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^5hZhYbN09I57~cMc|{y}v`X*&vf`S{ zjao7ROBy6LE3gE2rW>u`{;wdgErH_|ThAfKm`{JUvO8Z${jsP)sV2-p)J}5&k38p! z!_`dU59cOG=xI812n#d_KU`Ar>7tyO^eoj!fm+j5e*W^`?(+6@fRg!79rK?I(@M5y zhKibtt(#(ycV-87gv8a-N>=Ww>sz@`uHavxI=R(Zb7roI*2$#QAdf9`bF>X#J<+LN rvB`eh{f-YT;wuiH_^H-f|A<$*ZLY2M{m(u?&og+s`njxgN@xNA!bXEa diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png deleted file mode 100644 index 5b6efea09b4f5cc12c3860380b510bd3d2394937..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)2a@r0 zAtRZps$9d95S}!02%SNQR7Np;BfJ7y`JFl<8pdUHDK~H=fFm9GjRHZC!vo>+vPrHX zX2;`h3lFRVDCE`wRC22TO8M6SYWc?i4!JRaOa3;1Q{D;SmOlmbA#Vc=au!6N@`j+k zoX&%P6Dn2YG9EP%DSF`X6DHFPS}$InlmCS6Kw|h3gZjoilA~2s6(;fU96*ohE& lc{uDdaMK)MNixas16O^?=A@!Qwch{$002ovPDHLkV1iZ(nGOH| diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png deleted file mode 100644 index 470b9c5c583cededb7aee5dfaa5908a9074b7170..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 519 zcmV+i0{H!jP)3R^=AN5LC-1aDG2f=BQO?p*3k&~(vs^~5enOvO%Pn-B^-U?$9b-FESP zX+pyM^?{N2CRqiGAT7SX-hl}pm_T_jRR+eS!D0zq5i9{``4fy0743iKDAq(i0uOQ$5nmcQA3xpUTz*T;;$#WoPa=@JO$fSU|<&n_=66BFl0aE0V z!2y!wkwF2{ z(7+)vV(>yEEn?KfBq?I_MkXa<(#R(vV)9BkcLd4II%fpgPV5@t`O$M(+7gH$9lCoX zO!c(ge!K!9(2~`Vfn8_BZ5hu9el@*nkF diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png deleted file mode 100644 index 16ee84f807c10da2e16bb9fbcbf9785525241dd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 618 zcmV-w0+s!VP)@~0drDELIAGL9O(c600d`2O+f$vv5yP|KpvnWU*jnPX@FMw z8V?c30(8pPR1v0eyeW!&4FpVp0B!k-5@5aCMbAKl0>_xktGg_F&wvQ00md$mI19i* z9&r+Yi#%dI04I6GY5;EXh_wJ5{s=Yp z0VcnM>Py#`S8yLi^QZkj+XF*R4kSW~(7F%_CBoT>Ob8J=H$u`QXpN*KN6=o0NsVAM zlam<1cqb?=La(8uqzJv2qEaFZn#xLuFnBA>J%W|7H0KD`*5X_vSe?srj9~pg zN`AZjNP!UY%hA>d9^?@(x5JGHp5(oQ&u~d{n}SFF0D3qH_NK%E?EnA(07*qoM6N<$ Ef;dj|%>V!Z diff --git a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml deleted file mode 100644 index 7627fda10..000000000 --- a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml +++ /dev/null @@ -1,4 +0,0 @@ - - ms-appx:///Uno.Toolkit.UI.Material/Assets/MaterialBackIcon.png - diff --git a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml deleted file mode 100644 index 8346fca0c..000000000 --- a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml +++ /dev/null @@ -1,4 +0,0 @@ - - ms-appx:///Uno.Toolkit.WinUI.Material/Assets/MaterialBackIcon.png - diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml index 258eb9e78..fc25d60fb 100644 --- a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml +++ b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml @@ -18,6 +18,7 @@ xmlns:toolkit="using:Uno.UI.Toolkit" xmlns:um="using:Uno.Material" xmlns:utu="using:Uno.Toolkit.UI" + xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" mc:Ignorable="android ios not_win mobile"> @@ -81,6 +82,7 @@ 56 12,16,12,16 Collapsed + M20 11H7.83L13.42 5.41L12 4L4 12L12 20L13.41 18.59L7.83 13H20V11Z @@ -137,6 +139,7 @@ 56 12,16,12,16 Collapsed + M20 11H7.83L13.42 5.41L12 4L4 12L12 20L13.41 18.59L7.83 13H20V11Z @@ -178,10 +181,10 @@ BasedOn="{StaticResource MaterialAppBarButtonStyle}" TargetType="AppBarButton"> - - - - + + + + diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj index 041a40fd6..e3979e740 100644 --- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj +++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj @@ -30,7 +30,6 @@ - diff --git a/src/library/Uno.Toolkit.Material/xamlmerge-material.props b/src/library/Uno.Toolkit.Material/xamlmerge-material.props index 280f4fbb6..d76a314e1 100644 --- a/src/library/Uno.Toolkit.Material/xamlmerge-material.props +++ b/src/library/Uno.Toolkit.Material/xamlmerge-material.props @@ -6,7 +6,6 @@ - From ef56055f89bc41e4a289dba209116e3ed634558a Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Fri, 29 Sep 2023 12:30:37 -0400 Subject: [PATCH 2/3] docs: update docs --- doc/controls/NavigationBar.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/controls/NavigationBar.md b/doc/controls/NavigationBar.md index 23a98944c..04044c96c 100644 --- a/doc/controls/NavigationBar.md +++ b/doc/controls/NavigationBar.md @@ -307,6 +307,10 @@ 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`. + + ### MainCommand Properties ### Label @@ -390,7 +394,7 @@ Gets or sets the back button icon for the `MainCommand`. Remarks: -Only supports `BitmapImage` +Only supports `BitmapImage` on iOS/Android ## Lightweight Styling From 97f9c3239e7402b96c143589356c4646c48f0d16 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Fri, 29 Sep 2023 13:55:31 -0400 Subject: [PATCH 3/3] chore: pr comments --- src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml | 1 + .../Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml b/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml index 62b0d6120..f592fe663 100644 --- a/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml +++ b/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml @@ -41,6 +41,7 @@