From 3eb03d4347f0c6449ed8932c94ee617e12dda8da Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Tue, 7 Jun 2022 18:14:33 +0800 Subject: [PATCH] Add Maui Images --- .../Common.Essentials.Maui.csproj | 6 +++- .../MauiHandlersCollectionExtensions.cs | 19 +++++++++++ src/ST.Client.Maui.App/MauiProgram.cs | 7 ++-- .../ST.Client.Maui.App.csproj | 4 --- src/ST.Client.Maui/ST.Client.Maui.csproj | 32 +++++++++++++----- src/ST.Client.Maui/UI/AppShell.xaml | 30 +++++++++------- src/ST.Client.Maui/UI/AppShell.xaml.cs | 7 ++++ .../UI/Assets/Images/aboutpageviewmodel.png | Bin 0 -> 944 bytes .../archisteamfarmpluspageviewmodel.png | Bin 0 -> 1325 bytes .../UI/Assets/Images/avatar.jpg | Bin 0 -> 2093 bytes .../Images/communityproxypageviewmodel.png | Bin 0 -> 460 bytes .../UI/Assets/Images/debugpageviewmodel.png | Bin 0 -> 624 bytes .../Assets/Images/gamelistpageviewmodel.png | Bin 0 -> 1275 bytes .../Images/gamerelatedpageviewmodel.png | Bin 0 -> 1220 bytes .../Assets/Images/localauthpageviewmodel.png | Bin 0 -> 1140 bytes .../Images/proxyscriptmanagepageviewmodel.png | Bin 0 -> 652 bytes .../Assets/Images/settingspageviewmodel.png | Bin 0 -> 1321 bytes .../UI/Assets/Images/startpageviewmodel.png | Bin 0 -> 1106 bytes .../Images/steamaccountpageviewmodel.png | Bin 0 -> 609 bytes .../UI/ViewModels/Base/TabItemViewModel.cs | 3 +- src/Startup.cs | 2 ++ 21 files changed, 79 insertions(+), 31 deletions(-) create mode 100644 src/Common.Essentials.Xamarin/MauiHandlersCollectionExtensions.cs create mode 100644 src/ST.Client.Maui/UI/Assets/Images/aboutpageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/archisteamfarmpluspageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/avatar.jpg create mode 100644 src/ST.Client.Maui/UI/Assets/Images/communityproxypageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/debugpageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/gamelistpageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/gamerelatedpageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/localauthpageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/proxyscriptmanagepageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/settingspageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/startpageviewmodel.png create mode 100644 src/ST.Client.Maui/UI/Assets/Images/steamaccountpageviewmodel.png diff --git a/src/Common.Essentials.Maui/Common.Essentials.Maui.csproj b/src/Common.Essentials.Maui/Common.Essentials.Maui.csproj index 879a70dcfa4..58c13d578b6 100644 --- a/src/Common.Essentials.Maui/Common.Essentials.Maui.csproj +++ b/src/Common.Essentials.Maui/Common.Essentials.Maui.csproj @@ -26,13 +26,17 @@ + + + + - + diff --git a/src/Common.Essentials.Xamarin/MauiHandlersCollectionExtensions.cs b/src/Common.Essentials.Xamarin/MauiHandlersCollectionExtensions.cs new file mode 100644 index 00000000000..8e582ebe236 --- /dev/null +++ b/src/Common.Essentials.Xamarin/MauiHandlersCollectionExtensions.cs @@ -0,0 +1,19 @@ +#if MAUI +using System.Diagnostics.CodeAnalysis; + +namespace Microsoft.Maui.Hosting; + +public static class MauiHandlersCollectionExtensions +{ + public static IMauiHandlersCollection ReplaceHandler(this IMauiHandlersCollection handlersCollection) + where TType : IElement + where TTypeRender : IElementHandler + { + var serviceType = typeof(TType); + var items = handlersCollection.Where(x => x.ServiceType == serviceType).ToArray(); + Array.ForEach(items, x => handlersCollection.Remove(x)); + handlersCollection.AddHandler(); + return handlersCollection; + } +} +#endif \ No newline at end of file diff --git a/src/ST.Client.Maui.App/MauiProgram.cs b/src/ST.Client.Maui.App/MauiProgram.cs index 5c7c33ff409..56cb6f329fd 100644 --- a/src/ST.Client.Maui.App/MauiProgram.cs +++ b/src/ST.Client.Maui.App/MauiProgram.cs @@ -59,15 +59,14 @@ static int Main(string[] args) host.ConfigureServicesDelegate = level => { - builder = MauiApp.CreateBuilder(); - - builder + builder = MauiApp.CreateBuilder() .UseMauiApp(_ => new App(host)) .ConfigureFonts(fonts => { fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); - }); + }) + ; ConfigureServices(host, level, builder.Services); }; diff --git a/src/ST.Client.Maui.App/ST.Client.Maui.App.csproj b/src/ST.Client.Maui.App/ST.Client.Maui.App.csproj index 201f0940af4..286e6684590 100644 --- a/src/ST.Client.Maui.App/ST.Client.Maui.App.csproj +++ b/src/ST.Client.Maui.App/ST.Client.Maui.App.csproj @@ -78,8 +78,4 @@ - - - - diff --git a/src/ST.Client.Maui/ST.Client.Maui.csproj b/src/ST.Client.Maui/ST.Client.Maui.csproj index 62ded487f38..8de27a4c462 100644 --- a/src/ST.Client.Maui/ST.Client.Maui.csproj +++ b/src/ST.Client.Maui/ST.Client.Maui.csproj @@ -1,13 +1,17 @@ - net6.0 + net6.0-android;net6.0-ios;net6.0-maccatalyst + $(TargetFrameworks);net6.0-windows10.0.19041.0 + + System.Application System.Application.SteamTools.Client.Maui true true enable MAUI;$(DefineConstants) + false @@ -50,19 +54,31 @@ - - - + + 14.2 + + + + 14.0 + + + + 21.0 + + + + 10.0.17763.0 + + + + 6.5 + - - - - diff --git a/src/ST.Client.Maui/UI/AppShell.xaml b/src/ST.Client.Maui/UI/AppShell.xaml index ea6a294a81e..322b21a5e5d 100644 --- a/src/ST.Client.Maui/UI/AppShell.xaml +++ b/src/ST.Client.Maui/UI/AppShell.xaml @@ -10,22 +10,26 @@ x:DataType="vm:MainWindowViewModel"> - + - - diff --git a/src/ST.Client.Maui/UI/AppShell.xaml.cs b/src/ST.Client.Maui/UI/AppShell.xaml.cs index 53739214d6b..97cdb7f0150 100644 --- a/src/ST.Client.Maui/UI/AppShell.xaml.cs +++ b/src/ST.Client.Maui/UI/AppShell.xaml.cs @@ -42,6 +42,13 @@ public AppShell(MainWindowViewModel viewModel) InitializeComponent(); + //#if WINDOWS + // Microsoft.Maui.Controls.Handlers.ShellHandler.Mapper.AppendToMapping(nameof(AppShell), (handler, view) => + // { + // handler.PlatformView.PaneDisplayMode = Microsoft.UI.Xaml.Controls.NavigationViewPaneDisplayMode.LeftCompact; + // }); + //#endif + if (!IsUseBottomNav) { #region Flyout diff --git a/src/ST.Client.Maui/UI/Assets/Images/aboutpageviewmodel.png b/src/ST.Client.Maui/UI/Assets/Images/aboutpageviewmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..f407064ba87b1df2245c223ad119f94eaf047297 GIT binary patch literal 944 zcmV;h15f;kP)K~z|U?UzqzR96(nzx(D*QYT6sH8F{Cv>44`(MHp*#J{Vm&{&Xc zBvhqPC^XP61ph4DxoKBzDHOqiN+lHPzm1?oQ=tp3O~q2M+F%o>saABNPBOgvzOM@t zeUr(|dlPllp3UWQ-aWtXopavdKH$G@W-5o)^~lY7|I~RN8s!+{T4a*bXa9YEy|FJ% zz>407wPw`oAWXZcb&}$uAOWI4!HVpa%n8?```3=Tp%)^c?NlbgMB*b*yCuCU0+KKR zKDHOe{5jElP7^=yN5`z}lm)b2$S!uQPKrtgf``F_&kY)3%gt?#Kb2xQr5r2IJ=ow_ zU3v~UBs5v-{DQ-Sn=8sdThDM>cV~>`<3Ed9R2J@e zXsz)e0au1&ka0`F!6$JB;F=Y;-)p*8wgjVjcULH!Lf0Y(-@cu~v5hHoHHX3>X+HDZ zTeb(@>UmU8;^WY?`xY%TtDl}r&#Ho~Ee9W8Kdk?%e_@d61~;CyoseomYmOK`>$?xv z00QvomHUvH76yl?Y7yH3?4MKs#P+BScYU-PJ1!1G6kw_#gu3&c+`geIUxd5V+Je8N6f$#%=yLf3Bf#zLQit6*!4U zfI4$~T8@`ul)RJzz`*uYuWam1`8pzr6~HB`+xJatIe2IWf>!%wf2(86PM>-Q(t;B3 zL6Ilv>rifA`f`-GQ~EWV^To|2@HNlUX`=7L7$-yP4L;n}avjDfJi`C>%>D&AD(0_o SRWlU;0000E}#4UuXGn@11+6 zb7yQqOic7l=FFP&wbxl^?|lyNUoR5WI59JGKeS$5(pV@TSMb%ODijP1wl+0gza;__ zlhdz)JO}`UQ!@wyAQ$5dg%7W6Y58iY1k~aNYW*xpXcE*KT35mvnnXUA$DzY7;L_!v zK{A}r>4UeVz}TNR2^RP3Y_7P^G8~V`G5GxtAb@9{ehLc<3&?Aouq^X4rR3Dy)YPZ# z?d{o01VRA{R50vO^5e4u-++YzhLa;mr_+Ea2)ULTJp_8{mp4rg|9<0)QaD*-nx~ta zn`f#j@W<#l?Q{02;8(<{Tzui;1$17TLY4`FFhdqZ36uzwC38rg|d%ai$wLO<4La)3D)Ykz+31Dg(tO+A8Mt@ZwNDL=^ zA#cOskr5o}eFLevx#GAD>(}GC{XGa#M0|{u-^8*rneSJu$Qj3QH0IpoUigV}Ad4{zHCT^l(?>?9(Kk=N=`D%@i7q1Zz z1&)_Hi;j(r2O4+F=#6nNQtS|b%+6w2?=gf1zI8T4Xfh`{_xaxvpySo9l(AT>DuHM$ z>P3n}#4Y9*XN$){>Mz%=TQ{|Men1pxn}}0Axn~a|kqD+HC(+o{h=GBxv7>7T#%_!v zx+#WOELw~l03`$%3fUV1AS{c&YQwjV~@q z0j-H-GKq$U29Uta>@-%jww4+$s^b9{(=b5OvJ;cLJuQLfA4q`I7#|0t z&*{A)0WZo53TQH=LaJ^>OAAC4lwp)SQvB~g|AWORq4y(%XjYUzkN^vOi^9W??dk@c zcYxD_AbX2uBbUvgCS2nXmCQ0z%Ceuo1U}2p55~6%rOo|c$Y%2Km-t|GxyvTd$byXG6eu&+m^e}12`YlHxQ4n2o>-MAl(poRDgPqfKAFi z8UayVexQN^OD*wuylz3uP9@S!q8mU&JY`Y^gX_0-c8>mI1pI}h8vOC6t(x2=Km?F? jw{C8)7=Hhke@*!di*a@+Og+-^00000NkvXXu0mjfigi_W literal 0 HcmV?d00001 diff --git a/src/ST.Client.Maui/UI/Assets/Images/avatar.jpg b/src/ST.Client.Maui/UI/Assets/Images/avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ce610dc0635693dea7b4433d529f29d01c8d08de GIT binary patch literal 2093 zcma)5dpy(o8~=`kb^K7FaFkH8bo<4kj!uL|bDzbuP8T$iTw^2YR}rZcb4lbfV{?f$ z6UOME+mc<}w~;1|amaO({rotc^XKn8&+~dc&*$}dUa$A%^?GDIvOz%2!475zfIt8M zT1h}Q1Z=U5!uSCI3}yl-0e^?AAFx^3`~M*)2Li1WNbX1cJ;})!zy>9t7N`Y*)B)M= zfbI&W{A&FLqzvAmv`#^B{mQSS8XyOflUD#KZ%|NQTTocPPElS-1EjoJ)5sRAuC+zq z&A<1mCtN)vZl`m%?mV5EvCDY39rB!CNMw9wKB1V_+9m4)l>Vpj7*G=R7t%i( zzK)k(96sR1s?9WS-={fS)|zgWhcLc|pxwOtYle7o7Iu+R<%Z*P0(&I+mrqgV_v6hE zmj~YK=3@}d%s(0s9u6!qQZc^s`D8?dPtVs)&~MIVmgn?2(pykBH}>G*C*d`{dhNU+ zgc-E{Ku)ax`~q@Xw=m{N)_VHQ`vlKse$)^`tee5qj{0`By2G zneT8J^id7C1Sq|A~tDB0du3bjcc%BTvIZeir*hSfB;lACG7mRAq(2L{ufl$!w+vg;1 zxBgXnHT~zhwzoJQMnCt1gxM_()ri*YFh%HDnV+7tvD1ADcPAl{{m}`JkyLTEXFWwl1~*n&*V~7w;?t{es?ih|X7Cq8Pu6AX6gE3AwO<-uZgWTC+)?VJEdwZy zCpB<_=*EB{-|Lu^G@p_K9{0uUd^AgZ22An|hKTFtM6k}gsv!#+f#aJTG&^kmoRdN)s(>0w?dcE?-#Q<%Ong|WGPuma}SM74NlYyxtGN$ zCk>ZCv?Lci-1=wLrF3^wNEqVbQVUAgd#~lmT9B(EZ#m7x3Q+>9 zRBz&FPBmWIST(pqukvo`LhQv@Yr5VJ_Jo;D#fXwZjc~~$?Zc`;b{WERW*_9^whd(rf_hP(-;`aODk(dzm>cP>juVQid8f` zIExRq?q|&;hgXWXzKY8JX5zAH4xswc_R}=1p#Z9ShZty>>7cjro_dki5E1j}S03@C zC&Br0eYcMGsVjxNVI7_rKilcOq;YC8oxv7r)p^r8YJ2Zw(d?5;f@XGFkTJ{LZ*#mN z2M~-uS{S`?jJCh|b$NbByLC`ZA%f1brJ~On)`87ZcC07%q%u)t98!7+QM5)xPWbc# ze>~R*Y2N^zx0B4oUjX~OXydUKr=w&*ARoT#Q)GLmC^n;=CN{cFQ93TbH1sPPm>+AV zSAKuRDXyp8H+J|oxj?|qT8EA8K0Gks)x)<=a>@rr=rQw4>z@7M( zjnss;&Z^-XtKjn0&{*Mz2j*EF?<&xJxF*v9Ta%^_l^~|Nx-lg0jw-uJ3GnVrc7ZrmSPDE!q=BG@Io(Io; z#q1_UX)k_mZnsZtn^p{Ta-VKeDO4MtXGt5+msVIs*NWkoQ z6f}6rxCcs|*i_Ox-+z8mkS>U%eNFMdKI6ZjetLP74eiA+k#{?iTSt<3jrLRVU-qI% zm^1HUc!S&0BCh=B`=$WTQ-6Z|XmY+##dd>G-UvSarz)_8Ha4+!kW7LZdX@_n{3p;u zE%zUPx4VJfHz&WSLTRcVZ5lL!<4TfagMWK+5c)F0DI-2!?ke9)MaX_EF bc_^w2ySK~RG5Dk;hrH#7uz%LK$$I|_nh&`X literal 0 HcmV?d00001 diff --git a/src/ST.Client.Maui/UI/Assets/Images/communityproxypageviewmodel.png b/src/ST.Client.Maui/UI/Assets/Images/communityproxypageviewmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..f0aa837d417bf5a7f73dd8b1afa780b3f0c1bea3 GIT binary patch literal 460 zcmV;-0WMepyHL`CgM(|qMHdDC zL(xqq2UjW9qJKbfac~kh*U}FycF@I-xU9BkqSUb#75XL9S$*fpxt6q!EDf(+mN>q z>uoJZ5v8PGfr?BQQErn*U@@{bKpr^P)2h?&JaPnuHtV|Kz)e_qEC77=HNz1_IjSaf z1RG6pzJ(Xf{HI!urLg%!Ll}fUek_#w|7uAaHW!sQ0u0K1XbhlNgKwC^)M+s+ksmZ+RRhH5mg?P`#K@ z&*=eJ$!`yu{{?^a0X$T*>OK_!-(z(&L!!kSs#m{VQfZuVzLSdp0000k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-G$+Qd;gjJKpuOE zr>`sfGgeMMeyNkLQB@2Kj1`_Pjv*e$-%j1{eb_Fv6* zu;azMSMthTi@SI1?CxM)`Xf1*U0pDwfa8|K)k)7RpUir4Da60zjr64I`+I&rtG<6{ z_W^}}GF%T{`hxO+L$|jo}3%+g2VsLG45d4bb3PMJF^t4&#TxXQyK*e7&cwj zO_tcwG+RQrwqB<$MPU7l?;%I!bh;FNHA-B6|2cT+bOpowpp5C|wgw6t&m}jx#7+D# zT||>radOUvNsBfwED%a}UbSP&%E;9Q(-`<}S2(nWW{XM+&(3+on0jsPKIi_<568rG z6S|hp>$IOG;i#&Y`LLKJOl{Z8w~|JuEpq)Vo?pG>V(!WGY=%R{^BD@u&fGtvwOYZ; zu2HR>#fpFC!YP-XwqIGS=A|vbHRs}!zHJXZRG0U+?%LU+*Lv7=*-FQEjsglAz6%+i z{oYo*+~3-oqhR5drVHVRf7)5s`m+ewM;?+oEfR8v`C`WzkEDxD4()pn+P|Fth?{@M zPv7VTn`(g3qFUk_QIe8al4_M)lnSI6j0}v7bPY^(4J<HoNLvDUbW?Cg~4RtgJ>=D6n(ySG8e~fAaL;l+KAx{-Jtr(4;7Mh#(>eLh%|z z1SmZh0RgGFFRl;739c3vq1qVQ-v3=iUR;b-{Fr;8lZ*zSRnh0xqeL1doz@sGxC&zwxRD zP=+NH@S+<;@Zv=&P^4M4{8jMMsvw__!NeQFvq&3&2Ef{uC~^cAYw=t~V?!ObV9L9z z0+Rrf03$+e_n&ONK9MI*Wuw>S4H}xt35YaT)D6Lk<>|-TS+(L>nlsZO-W?U-in>!- zu6ef=H3K0_hsG1+ha!*CLfZ_bHWZ{eifly?Yq7?nbum9jYmBiVg3>AhjuIiEfRGMP zV?)K!$H*5$A98dca~g#KUaHipo-DI<-tDu92!EvO zIN5le`YugN*hJQjW6qenxJn};35xZ$X;gsRJzfQJ6m_0C8fU34_#XW4+pP4U@et^yP9G zW61Rn+_U9k1>%VZ^_Ml~+5iun8^ZHa@wkp4j_cK`ExY$GS8ynvR*7K}1_9O>9M?r@ zJ^HAvo_6sR6~cUg>v>hGl^W8@a#y3rir9+Gq8+%Nhq&(Fwp>#B=z}YdaBx#z`CS~Q zYve$%^Q!2aCo=^!{aL0;`_eU0RC%h_5u5o3o1^zVvyeuyJ|FeWF`z>068D~C*&{B z3-*1uee-7!9Y%ov#@f{)cC`pSRdvrJ@<}SN?b|xmU%OWVySH^*F*@Cb*W^@q l#`k^uZ(`lI`}W_pzW_iB8_c4G literal 0 HcmV?d00001 diff --git a/src/ST.Client.Maui/UI/Assets/Images/gamerelatedpageviewmodel.png b/src/ST.Client.Maui/UI/Assets/Images/gamerelatedpageviewmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..651c348c409b576502f362100e1d40c5d57df1dc GIT binary patch literal 1220 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 literal 0 HcmV?d00001 diff --git a/src/ST.Client.Maui/UI/Assets/Images/settingspageviewmodel.png b/src/ST.Client.Maui/UI/Assets/Images/settingspageviewmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..ffbdd34f62eb9f4e9c397ef4eaee51718abc2a63 GIT binary patch literal 1321 zcmV+^1=jkBP)Oq56hC7LD%$5?4GfV3$H29yvbfdY~c(ZowAYOB&nL{o);QzQjSnP#jwm!3K6 z_hC9P?VLFfG0_Ls)5dRZ}rzMIq|Ou@HaKx=!v`50bC5gAQ1!cN{+|cv~=mx7yvXiHF^7E`UN2y2zp6c zAhyG0zU*JI;=(@`P`7sDomycBz)1i=UVcV02&f|oUuKZ-5d=wqz@UF#fa<#1Wd}1c zTuuVCQZ<0s!2!Sr@II2@Wnd~CB=QyTB7lqnw37hP`Z5FjlJ5Xd_>eCgU(!*4(&1}? zgMbhbCxqiCAXq*e?s2=!NfU2zkITwARpC!!V3XzL02b@2~==x{U;!0C6E==_zmf zm-pFm47*@M!{%H2GFh$|xpF`MlB#1-DLkLCUC>c8vBfK7z6c_5g zP`}j|3TY;?kZnLJX5RhqzV8oy5_8Nz-P#Sam0~5RmH;SBP5a!+3b)tmMOWVdmhb68 zPk(H%ItfJ!6LLLx=b4!(8=s4K+`^U*cgLf#0av0X2!Wgui_H*eTleOxZD|7P>o<-P z4}-~AYQasJT!>psieQRD_10r)a3umzP%tVB2WsbHgx8JlemIIl?Hvg?lf_AhkZ_x$ z*Zch;Af*c|52xC}N#f@GJZP=)X=f-STv5;+yomiBr(qZdN{fr^;2^2QblsNRUte}q zo*kS7az-Yqz4L51BV19S#KO_8Ahg!-jlRha4k2L)N2du;iUXPYTx$ixFrX6o$p}{z zXb@U!D5Y%SB%wsiGyxLFIXgH>grhNNt#QYM97nhk3o}ddVHgHNfBb0+AB^>+2{6PJ zP*9B&emnexJ9DlVT5CKqV=N}*dNRTb^0Kj@vJ6^l96K3EhYQ;+VPjlJ0%={4YOk+u zyqDk(P~{VZ$L%(&AAQj6^>`5I4P(iB9q0~TOoMN$nTN6hA51fjRqHp$!;y$<5PqJ* zr#8IxTH0L5coO;>8fO!1CFvr8qKV_J2kyDca2W&`&=3_x+8M3oH z(AvQEogZ00{c_wGgvW(4XX9#rn;pmTKCrTW{a%vulV^KzQGs>;oY_WJmUqYzob*jI zj-C4sq{0DWZ}aMvk7Z(9VHnBh1m-6P%Zb1#<8=2~vts(~?vhD`7~>lSA<-M`!?BZH zX#M7JJQ9t%h7=t6nG?fN0EA&+u$_?Tj7T)*KGfcU*0#fTeeN0_6Cmt_xYB)~JQdEN zZdQm|C&4lQV(#kkS>DTe(#+8TuaNsA)8iJ?K1KT zJGT;iTF5vl@5f?R?e-1zL8tw%`p0CMzrI)r7G2b_weR}H8{&)5_GmZ{q@2&hD00000NkvXXu0mjf+eluK literal 0 HcmV?d00001 diff --git a/src/ST.Client.Maui/UI/Assets/Images/startpageviewmodel.png b/src/ST.Client.Maui/UI/Assets/Images/startpageviewmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..0a21c5b72ab13fcc51f28fdac6b40cdd0ae50315 GIT binary patch literal 1106 zcmV-Y1g-mtP)Ht4A5mBz$s}wcqet{FN$7!t_V0hI4qV?Vy4Be|Bl51Yz z4BBX`9kP!Xn$svW@W&=|vo@q(P!Wwn3=^wk4}oXiL3@hOCZ3kfV`>&aN|9NC~I=RF~c+B}ncpsK!;q`j)MXpD0+(az;EqZna0gu3rjw+AZH{$j!m4DF+eDN@zsu5oo z!gEQVS+$;u-Jepv{$_kWA0m>9kH_PTo%)RnZ*|}dpG^4$_S*jVvzz;H3I^zD!&frl z?-qC@>GR%FPvvVLQyQtpG|hhn(jXFv1mkB%`0Kr$*vAJ*3;IeK@y8pF5X%eDe`j$i ziTEL)Iq9=n?kDoXyIdVAONplor@yb=aB62t5ex<~wzgxGR513z%jnoe zfNKOk1R5ayLnN|Gi@Io(go(V-O=WW%fj}T7E+Q#`^l`p9%d%M8w1tY!{iskST2#!{ z#;aK^0Qjc%s+%@^)_)>Yy$-+MzpNeS8mB+!=H?jx^Ay8R-@9>3bUJlUvu?rE)RcI= z-qd3I*Q2lep0)Rq=vjMWj9ot<}JSV_PD^Okp z%E@d&rC%){AU(KH0DzhjMRdEB^9n8tAYae&!CqE?LTpt4mRhhx`riFDvlH+E#iuy4i*&qzgpF07*qoM6N<$f<3SfiU0rr literal 0 HcmV?d00001 diff --git a/src/ST.Client.Maui/UI/Assets/Images/steamaccountpageviewmodel.png b/src/ST.Client.Maui/UI/Assets/Images/steamaccountpageviewmodel.png new file mode 100644 index 0000000000000000000000000000000000000000..d5337d5519274aa947676c0234e4bcf706cdcce6 GIT binary patch literal 609 zcmV-n0-pVeP)oItfPq1c&0} z=;R;Z_mZgYS|LTA{(Nz#5{`MRz*s|2 z*Ro7B6agsh>eZt>uSK~V$G`Kd(>-ncm^(iLaFpkPD6is}17xz9x~f{oM4}~#0Eluu zuK7p~f6P2B@F5p~O(_AmT5uTv25?p2GFqTa*#nl?LI9^<+x4@PGwUfAl6&0JgM}-w z$Oen}CvJfOHSr0|JmvX;u(7XifZL+1sW`4wN?nB}aB{FIFMR-nTTlQVI&U+; z2uzd@KFlH1g5^GsRroY(f+(N60VQ7m6YJgjqS^Bms-oPVV*aR6kjN9u3&1ppG|a64 vHi)#$od5tE`x>aQCyD~4gH5qMuaoK@c3A8Y1M~O$00000NkvXXu0mjfwyGF} literal 0 HcmV?d00001 diff --git a/src/ST.Client/UI/ViewModels/Base/TabItemViewModel.cs b/src/ST.Client/UI/ViewModels/Base/TabItemViewModel.cs index 9544fbad8db..36698006da4 100644 --- a/src/ST.Client/UI/ViewModels/Base/TabItemViewModel.cs +++ b/src/ST.Client/UI/ViewModels/Base/TabItemViewModel.cs @@ -34,7 +34,8 @@ public virtual IList? MenuItems protected TabItemViewModelBase() : base() { - IconKey = this.GetType().Name; + var typeName = GetType().Name; + IconKey = OperatingSystem2.Application.UseMaui() ? $"{typeName.ToLowerInvariant()}.png" : typeName; } public virtual void Initialize() diff --git a/src/Startup.cs b/src/Startup.cs index 2b881962a1b..0a2e648886d 100644 --- a/src/Startup.cs +++ b/src/Startup.cs @@ -40,7 +40,9 @@ using Microsoft.Extensions.Http; using Xamarin.Android.Net; using Program = System.Application.UI.MainApplication; +#if !NET6_0_OR_GREATER using PlatformApplication = System.Application.UI.MainApplication; +#endif #elif __IOS__ using Program = System.Application.UI.AppDelegate; #elif !__MOBILE__