From 6f8445b66539b71abdf4ed47c6038fb295e45733 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sun, 14 Mar 2021 13:56:15 +0100 Subject: [PATCH 1/5] Created blank WinUI 3 Desktop app --- samples/MvvmSampleWinUI3Desktop.sln | 57 ++++++++++++ .../Images/LockScreenLogo.scale-200.png | Bin 0 -> 1430 bytes .../Images/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Images/Square150x150Logo.scale-200.png | Bin 0 -> 2937 bytes .../Images/Square44x44Logo.scale-200.png | Bin 0 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 0 -> 1255 bytes .../Images/StoreLogo.png | Bin 0 -> 1451 bytes .../Images/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../MvvmSampleWinUI3Desktop (Package).wapproj | 88 ++++++++++++++++++ .../Package.appxmanifest | 48 ++++++++++ .../MvvmSampleWinUI3Desktop/App.xaml | 15 +++ .../MvvmSampleWinUI3Desktop/App.xaml.cs | 64 +++++++++++++ .../MvvmSampleWinUI3Desktop/MainWindow.xaml | 13 +++ .../MainWindow.xaml.cs | 36 +++++++ .../MvvmSampleWinUI3Desktop.csproj | 18 ++++ .../MvvmSampleWinUI3Desktop/app.manifest | 15 +++ 16 files changed, 354 insertions(+) create mode 100644 samples/MvvmSampleWinUI3Desktop.sln create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/LockScreenLogo.scale-200.png create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/SplashScreen.scale-200.png create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square150x150Logo.scale-200.png create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square44x44Logo.scale-200.png create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/StoreLogo.png create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Wide310x150Logo.scale-200.png create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Package.appxmanifest create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/app.manifest diff --git a/samples/MvvmSampleWinUI3Desktop.sln b/samples/MvvmSampleWinUI3Desktop.sln new file mode 100644 index 00000000..c2696b66 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop.sln @@ -0,0 +1,57 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31004.235 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MvvmSampleWinUI3Desktop (Package)", "MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop (Package)\MvvmSampleWinUI3Desktop (Package).wapproj", "{8E012FC5-B17A-4E98-A8CA-ED7571F9274E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmSampleWinUI3Desktop", "MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop.csproj", "{CB559D9F-B686-49EC-814C-FA7DC1912497}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|arm64 = Debug|arm64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|arm64 = Release|arm64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|arm64.ActiveCfg = Debug|arm64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|arm64.Build.0 = Debug|arm64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|arm64.Deploy.0 = Debug|arm64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x64.ActiveCfg = Debug|x64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x64.Build.0 = Debug|x64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x64.Deploy.0 = Debug|x64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x86.ActiveCfg = Debug|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x86.Build.0 = Debug|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x86.Deploy.0 = Debug|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|arm64.ActiveCfg = Release|arm64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|arm64.Build.0 = Release|arm64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|arm64.Deploy.0 = Release|arm64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x64.ActiveCfg = Release|x64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x64.Build.0 = Release|x64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x64.Deploy.0 = Release|x64 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x86.ActiveCfg = Release|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x86.Build.0 = Release|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x86.Deploy.0 = Release|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|arm64.ActiveCfg = Debug|arm64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|arm64.Build.0 = Debug|arm64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x64.ActiveCfg = Debug|x64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x64.Build.0 = Debug|x64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x86.ActiveCfg = Debug|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x86.Build.0 = Debug|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|arm64.ActiveCfg = Release|arm64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|arm64.Build.0 = Release|arm64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x64.ActiveCfg = Release|x64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x64.Build.0 = Release|x64 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x86.ActiveCfg = Release|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C9D13338-F430-461C-B906-F31D95512E65} + EndGlobalSection +EndGlobal diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/LockScreenLogo.scale-200.png b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/LockScreenLogo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..735f57adb5dfc01886d137b4e493d7e97cf13af3 GIT binary patch literal 1430 zcmaJ>TTC2P7~aKltDttVHYH6u8Io4i*}3fO&d$gd*bA_<3j~&e7%8(eXJLfhS!M@! zKrliY>>6yT4+Kr95$!DoD(Qn-5TP|{V_KS`k~E6(LGS@#`v$hQo&^^BKsw3HIsZBT z_y6C2n`lK@apunKojRQ^(_P}Mgewt$(^BBKCTZ;*xa?J3wQ7~@S0lUvbcLeq1Bg4o zH-bvQi|wt~L7q$~a-gDFP!{&TQfc3fX*6=uHv* zT&1&U(-)L%Xp^djI2?~eBF2cxC@YOP$+9d?P&h?lPy-9M2UT9fg5jKm1t$m#iWE{M zIf%q9@;fyT?0UP>tcw-bLkz;s2LlKl2qeP0w zECS7Ate+Awk|KQ+DOk;fl}Xsy4o^CY=pwq%QAAKKl628_yNPsK>?A>%D8fQG6IgdJ ztnxttBz#NI_a@fk7SU`WtrpsfZsNs9^0(2a z@C3#YO3>k~w7?2hipBf{#b6`}Xw1hlG$yi?;1dDs7k~xDAw@jiI*+tc;t2Lflg&bM)0!Y;0_@=w%`LW^8DsYpS#-bLOklX9r?Ei}TScw|4DbpW%+7 zFgAI)f51s}{y-eWb|vrU-Ya!GuYKP)J7z#*V_k^Xo>4!1Yqj*m)x&0L^tg3GJbVAJ zJ-Pl$R=NAabouV=^z_t;^K*0AvFs!vYU>_<|I^#c?>>CR<(T?=%{;U=aI*SbZADLH z&(f2wz_Y0??Tf|g;?|1Znw6}6U43Q#qNRwv1vp9uFn1)V#*4p&%$mP9x&15^OaBiDS(XppT|z^>;B{PLVEbS3IFYV yGvCsSX*m literal 0 HcmV?d00001 diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/SplashScreen.scale-200.png b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..023e7f1feda78d5100569825acedfd213a0d84e9 GIT binary patch literal 7700 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 literal 0 HcmV?d00001 diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square150x150Logo.scale-200.png b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square150x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..af49fec1a5484db1d52a7f9b5ec90a27c7030186 GIT binary patch literal 2937 zcma)84OCO-8BSud5)jwMLRVKgX(S?$n?Ld|vrsm<$CF7)&zTbyy1FE5bU`Q17MRv`9ue$;R(@8kR;#vJ*IM0>cJIAOte!d7oRgdH zd%ySjdB6L9=gX^A6)VzH7p2l@v~3zJAMw|DFy#^)F@@F*`mqUn=Il>l)8_+ab;nOW{%+iPx z+s{Eu|&pIs)Z7{La9~?xKfyl z#43?gjEL15d4WbOZo#SiP%>DB^+BcnJ=7dHEe;r#G=tuw|ka z%q@}##Uh7;tc%L_64m(kHtw74ty%BJMb)_1)#S0j`)F8_1jF7vScpsnH=0V19bO8y zR`0SjIdCUo&=>JwMQF8KHA<{ODHTiQh}0^@5QRmCA?gOH6_H3K^-_sNB^RrdNuK-R zOO*vOrKCVvDwgUck`kF(E7j{I#iiN;b*ZdCt4m@HPA`EuEqGGf4%!K<;(=I=&Vyrw z%TwcWtxa}8mCZ%Cyf&ActJ6_$ox5z6-D!0-dvnRx6t7y3d+h6QYpKWO;8OdnvERo7 zuEf>ih5`wqY)~o@OeVt-wM?Q!>QzdGRj!bz6fzYrfw$hZfAKzr2-M+D+R>}~oT574c;_3zquHcElqKIsryILt3g8n3jcMb+j?i?-L3FpZJ z2WRVBRdDPc+G5aaYg#5hpE+6nQ|(VSoxT3|biF;BUq#==-27Xi=gihDPYP$7?=9cP zYKE$jeQ|3~_L0VG-(F~2ZPyD0=k{J4Q~h(t__{-mz_w8{JDY9{`1ouzz!Vr5!ECdE z6U~O1k8c}24V7~zzXWTV-Pe4)y}wQJS&q%H5`Fo_f_JvIU489aCX$;P`u#!I-=^4ijC2{&9!O&h>mi?9oYD=GC#%)6{GzN6nQYw+Fal50!#x^asjBBR50i`+mho*ttoqV)ubM2KD9S~k7+FR4>{29?6 z{!l6kDdyTN0YJ9LgkPWeXm|gyi@zM3?0@{&pXT12w|78&W-q!RRF)&iLCEZVH<|fR zN0fr2^t8H(>L?>K#>^+jWROLral(Qy-xoBq1U7A&DV||wClb)Otd9?(gZ|8znMF}D zf<1haWz^s0qgecz;RFGt0C-B4g`jNGHsFU+;{<%t65v^sjk^h$lmWn#B0#_)9ij&d z-~lc`A)YYExi^7sBuPM^Y|wA2g*5?`K?#7tzELQYNxGo$UB$4J8RJp1k(8Jj+~hMT zlN~>M@KTTh^--8y3PK_NZ@AC!{PT=CziBzGd+wTJ^@icH!Bd}%)g8V)%K?|c&WTUk zy}qv1C%(fjRoZ4ozC3{O%@5?)XzH35zHns$pgU*Q?fj4v?fp1Qbm+j;3l;9jam9Da zXVcKjPlQ73x78QPu|Ffm6x?`~e3oD=gl=4kYK?={kD5j~QCXU)`HSdduNNENzA*2$ zOm3PzF!lN5e*06-f1Uot67wY#{o-S1!KZ7E=!~7ynnk9_iJR#kFoNbAOT#^2Gd17F zMmvU6>lndZQGd|ax9kUoXXO+$N?|j@6qpsF&_j7YXvwo_C{JpmLw5&#e6k>atv%es z5)7r*Wvv_JkUpT}M!_o!nVlEk1Zbl=a*2hQ*<|%*K1Glj^FcF`6kTzGQ3lz~2tCc@ z&x|tj;aH&1&9HwcJBcT`;{?a+pnej;M1HO(6Z{#J!cZA04hnFl;NXA+&`=7bjW_^o zfC40u3LMG?NdPtwGl>Tq6u}*QG)}-y;)lu-_>ee3kibW(69n0$0Zy!}9rQz%*v1iO zT9_H>99yIrSPYVy6^);rR}7Yo=J_T@hi+qhTZXnVWyf;JDYm5#eYLTxr*?kiNn!+Y zQ+LUkBafNJ#rH#C(?d5^;gw9o#%daEI{mA*LHPIHPU`#|H$hD zwm>0&+kahQ)E#%~k>&5@&#Vg82H?s%71=)(soi@174pi9--2{w{1$}Sz4zGn3Du&x bht0Iza^2ykEt4(epJ78uh5nDlX8(TxzDYwP literal 0 HcmV?d00001 diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square44x44Logo.scale-200.png b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square44x44Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..ce342a2ec8a61291ba76c54604aea7e9d20af11b GIT binary patch literal 1647 zcmaJ?eM}Q)7(e+G1Q(|`V9JhTI2>MkceK4;p;PR&$Pi?ejk3YQ_3o`S&|W_dsOZ8# zWPTt69g`t$ab`0cj-Y0yiBSOqmd)tG7G(}M5aP0_%&9TijB#&)I{zSE^4@#z^FF`l z`8{8`o%wlL(UI|y2!cdsuVamHH~H86F!*-15em4)NqUpCQM5?aoC_eCf@lV4wvF2a zjDQn1JBL69f&@2M3rvzJcfE!eZ8FZUBlFlC5RD)it33{mF9#B82AiyQE%w)`vlwa> zv{<1sm&kSKK$&%2jSFn7$t&P%%6Ue>R=EAnG8N7fqynWG8L3p!4801a;8{+nliO(qd(jNJ_?+9W3#hLIDLoT6~3fx9=`CC-D}-AMrpEO7HK zt3$GicGPc?GmDjy7K2P@La;eu4!$zWCZ`ym{Z$b zu-O6RM&K4JT|BIZB`E-gxqG%FzanI#+2FFmqHqXG7yxWB=w55RGOM)$xMb(>kSNR z2w=1AZi%z=AmG~yea~XaXJR!v7vLn(RUnELfiB1|6D84ICOS}^Zo2AdN}<&*h}G_u z{xZ!(%>tLT3J3<5XhWy-tg+6)0nmUUENLW8TWA{R6bgVd3X;anYFZ^IRis*_P-C-r z;i>%1^eL3UI2-{w8nuFFcs0e~7J{O2k^~Ce%+Ly4U?|=!0LH=t6()xi<^I-rs+9sF z*q{E-CxZbGPeu#a;XJwE;9S1?#R&uns>^0G3p`hEUF*v`M?@h%T%J%RChmD|EVydq zmHWh*_=S%emRC*mhxaVLzT@>Z2SX0u9v*DIJ@WC^kLVdlGV6LpK$KIrlJqc zpJ921)+3JJdTx|<`G&kXpKkjGJv=76R`yYIQ{#c-`%+`#V(7}Q;&@6U8!Td1`d;?N z_9mnI#?AA}4J!r)LN4!E-@H5eXauuB7TOawS>Y|{-P?NNx-lq+z1W-+y(;39P&&LP zL{N80?&=C*qKmdA^moMZRuPcD!B<*mq$ch=0Cnlitw#txRWhb3%TQvPqjkC`F69G4b! ze7z9MZ#+;_#l?H37UqUhDFb^l&s2{oM$3I0o^Q!yx;;V)QmCMo)Tb_ui|mit8MS?U zm##6$sZZ1$@|s%?l@>4Z<*Q}sRBSKMhb4I{e5LdEhsHIHTe8Bod5c>6QtT>$XgUBz z6MK`kO$=jmt@FqggOhJ5j~e@ygRbG;<{Vu)*+nn9aQeo0;$#j;|MS=S$&L?BeV25z xs3B`@=#`5TF{^6(A1rvdY@|-RtQ|iS5{tyX+wH?;n8E)G$kykv-D^wh{{!TZT%7;_ literal 0 HcmV?d00001 diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Square44x44Logo.targetsize-24_altform-unplated.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c02ce97e0a802b85f6021e822c89f8bf57d5cd GIT binary patch literal 1255 zcmaJ>TWs4@7*5+{G#S+&C!qC#> zf>5N3P6jO*Cz>ug*(_DmW=)kea&m$gZ^+nyiF`;j%w@}y8)>p*SH}C`m?DXeieF2U zyQHecc_L%Gh!7GMt+hG06y;+|p4>m~}PjA}rKViGiEnn7G0ZO<>G|7q;2?NwGCM3s?eued6%hd$B+ z*kQJ{#~$S=DFE(%=E+UkmlEI*%3llUf~8Ja9YU1Vui0IbGBkW_gHB%Rd&!!ioX zs40O?i9I{};kle7GMvE7(rk`la=gTI)47=>%?q@^iL-nUo3}h4S}N-KHn8t5mVP8w z&bSErwp+37 zNJJ8?a|{r5Q3R0Z5s-LB1WHOwYC@7pCHWND#cL1cZ?{kJ368_*(UDWUDyb<}0y@o# zfMF016iMWPCb6obAxT$JlB6(2DrlXDTB&!0`!m??4F(qWMhjVZo?JXQmz`1*58Z=& zcDmB|S-E@j?BoFGix0flckqdS4jsPNzhfWyWIM98GxcLs89C(~dw%$_t;JjX-SD}E zfiGV;{8Q%8r}w9x>EEigW81>`kvnU@pK)4+xk9@+bNj9L!AAZ@SZ@q|)&BmY3+HZx zul~BeG4|}-;L%cHViQGQX?^zFfO0&#cHwel=d`lH9sJ-@Sl@n*(8J2>%Ac`IxyY?Q z{=GhWvC#gu-~Ia7*n{=+;qM?Ul_wy1+u7ho;=`>EwP^g~R@{unBds`!#@}tluZQpS zm)M~nYEifJWJGx?_6DcTy>#uh%>!H9=hb^(v`=m3F1{L>db=<5_tm+_&knAQ2EU$s Mu9UqpbNZeC0BbUo^Z)<= literal 0 HcmV?d00001 diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/StoreLogo.png b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/StoreLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..7385b56c0e4d3c6b0efe3324aa1194157d837826 GIT binary patch literal 1451 zcmaJ>eN5D57_Z|bH;{0+1#mbl)eTU3{h)Wf7EZV?;HD@XL@{B`Ui%(2aMxQ~xdXSv z5nzWi(LW)U2=Vc-cY@s7nPt{i0hc6!7xN4NNHI#EQl>YNBy8l4%x9gr_W-j zEZMQmmTIy(>;lblRfh`dIyTgc9W5d!VP$L4(kKrN1c5G~(O_#xG zAJCNTstD^5SeXFB+&$h=ToJP2H>xr$iqPs-#O*;4(!Fjw25-!gEb*)mU}=)J;Iu>w zxK(5XoD0wrPSKQ~rbL^Cw6O_03*l*}i=ydbu7adJ6y;%@tjFeXIXT+ms30pmbOP%Q zX}S;+LBh8Tea~TSkHzvX6$rYb)+n&{kSbIqh|c7hmlxmwSiq5iVhU#iEQ<>a18|O^Sln-8t&+t`*{qBWo5M?wFM(JuimAOb5!K#D}XbslM@#1ZVz_;!9U zpfEpLAOz=0g@bd6Xj_ILi-x^!M}73h^o@}hM$1jflTs|Yuj9AL@A3<-?MV4!^4q`e z)fO@A;{9K^?W?DbnesnPr6kK>$zaKo&;FhFd(GYFCIU^T+OIMb%Tqo+P%oq(IdX7S zf6+HLO?7o0m+p>~Tp5UrXWh!UH!wZ5kv!E`_w)PTpI(#Iw{AS`gH4^b(bm^ZCq^FZ zY9DD7bH}rq9mg88+KgA$Zp!iWncuU2n1AuIa@=sWvUR-s`Qb{R*kk(SPU^`$6BXz8 zn#7yaFOIK%qGxyi`dYtm#&qqox0$h=pNi#u=M8zUG@bpiZ=3sT=1}Trr}39cC)H|v zbL?W)=&s4zrh)7>L(|cc%$1#!zfL?HjpeP%T+x_a+jZ16b^iKOHxFEX$7d|8${H-* zIrOJ5w&i$>*D>AKaIoYg`;{L@jM((Kt?$N$5OnuPqVvq**Nm}(f0wwOF%iX_Pba;V z;m@wxX&NcV3?<1+u?A{y_DIj7#m3Af1rCE)o`D&Y3}0%7E;iX1yMDiS)sh0wKi!36 zL!Wmq?P^Ku&rK~HJd97KkLTRl>ScGFYZNlYytWnhmuu|)L&ND8_PmkayQb{HOY640 bno1(wj@u8DCVuFR|31B*4ek@pZJqxCDDe1x literal 0 HcmV?d00001 diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Wide310x150Logo.scale-200.png b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Images/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..288995b397fdbef1fb7e85afd71445d5de1952c5 GIT binary patch literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA + + + 15.0 + + + + Debug + x86 + + + Release + x86 + + + Debug + x64 + + + Release + x64 + + + Debug + arm64 + + + Release + arm64 + + + + $(MSBuildExtensionsPath)\Microsoft\DesktopBridge\ + MvvmSampleWinUI3Desktop\ + + + + 8e012fc5-b17a-4e98-a8ca-ed7571f9274e + 10.0.19041.0 + 10.0.17763.0 + en-US + false + $(MSBuildThisFileDirectory)build\ + + + + Designer + + + + + + + + + + + + + + True + Properties\PublishProfiles\win10-$(Platform).pubxml + + + + + $(NUGET_PACKAGES) + $(UserProfile)\.nuget\packages + $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.5.0-prerelease')) + $(SolutionDir)packages\Microsoft.ProjectReunion.0.5.0-prerelease\ + $([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.5.0-prerelease')) + $(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.5.0-prerelease\ + $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props + $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets + ..\MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop.csproj + + + + all + + + all + + + + + + \ No newline at end of file diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Package.appxmanifest b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Package.appxmanifest new file mode 100644 index 00000000..1be0c8a1 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/Package.appxmanifest @@ -0,0 +1,48 @@ + + + + + + + + MvvmSampleWinUI3Desktop (Package) + Sergio + Images\StoreLogo.png + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml new file mode 100644 index 00000000..d7bca4dc --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs new file mode 100644 index 00000000..83deb4e2 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using Microsoft.UI.Xaml.Shapes; +using Windows.ApplicationModel; +using Windows.ApplicationModel.Activation; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace MvvmSampleWinUI3Desktop +{ + ///

+ /// Provides application-specific behavior to supplement the default Application class. + /// + public partial class App : Application + { + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + this.Suspending += OnSuspending; + } + + /// + /// Invoked when the application is launched normally by the end user. Other entry points + /// will be used such as when the application is launched to open a specific file. + /// + /// Details about the launch request and process. + protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args) + { + m_window = new MainWindow(); + m_window.Activate(); + } + + /// + /// Invoked when application execution is being suspended. Application state is saved + /// without knowing whether the application will be terminated or resumed with the contents + /// of memory still intact. + /// + /// The source of the suspend request. + /// Details about the suspend request. + private void OnSuspending(object sender, SuspendingEventArgs e) + { + // Save application state and stop any background activity + } + + private Window m_window; + } +} diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml new file mode 100644 index 00000000..0775df97 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml @@ -0,0 +1,13 @@ + + + + + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs new file mode 100644 index 00000000..6064472e --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices.WindowsRuntime; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Controls.Primitives; +using Microsoft.UI.Xaml.Data; +using Microsoft.UI.Xaml.Input; +using Microsoft.UI.Xaml.Media; +using Microsoft.UI.Xaml.Navigation; +using Windows.Foundation; +using Windows.Foundation.Collections; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace MvvmSampleWinUI3Desktop +{ + /// + /// An empty window that can be used on its own or navigated to within a Frame. + /// + public sealed partial class MainWindow : Window + { + public MainWindow() + { + this.InitializeComponent(); + } + + private void myButton_Click(object sender, RoutedEventArgs e) + { + myButton.Content = "Clicked"; + } + } +} diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj new file mode 100644 index 00000000..3d226f9f --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj @@ -0,0 +1,18 @@ + + + WinExe + net5.0-windows10.0.19041.0 + 10.0.17763.0 + MvvmSampleWinUI3Desktop + app.manifest + x86;x64;arm64 + win10-x86;win10-x64;win10-arm64 + + + + + + + + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/app.manifest b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/app.manifest new file mode 100644 index 00000000..547717f3 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/app.manifest @@ -0,0 +1,15 @@ + + + + + + + + true/PM + PerMonitorV2, PerMonitor + + + From 6a3d3b5088e393126f9078e1c652d35cac1999b6 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sun, 14 Mar 2021 14:30:19 +0100 Subject: [PATCH 2/5] Initial port of the sample app (crashing) --- .../MvvmSample.Core/MvvmSample.Core.csproj | 2 +- .../ViewModels/SamplePageViewModel.cs | 3 +- samples/MvvmSampleWinUI3Desktop.sln | 64 +++- .../MvvmSampleWinUI3Desktop (Package).wapproj | 35 ++ .../MvvmSampleWinUI3Desktop/App.xaml.cs | 31 +- .../Controls/InteractiveSample.cs | 51 +++ .../Controls/InteractiveSample.xaml | 69 ++++ .../MvvmSampleWinUI3Desktop/MainWindow.xaml | 7 +- .../MainWindow.xaml.cs | 23 +- .../MvvmSampleWinUI3Desktop.csproj | 84 ++++- .../Services/FileService.cs | 32 ++ .../Services/SettingsService.cs | 39 +++ .../MvvmSampleWinUI3Desktop/Shell.xaml | 206 ++++++++++++ .../MvvmSampleWinUI3Desktop/Shell.xaml.cs | 136 ++++++++ .../Views/AsyncRelayCommandPage.xaml | 90 +++++ .../Views/AsyncRelayCommandPage.xaml.cs | 19 ++ .../Views/BuildingTheUIPage.xaml | 32 ++ .../Views/BuildingTheUIPage.xaml.cs | 19 ++ .../Views/IntroductionPage.xaml | 28 ++ .../Views/IntroductionPage.xaml.cs | 19 ++ .../Views/IocPage.xaml | 29 ++ .../Views/IocPage.xaml.cs | 19 ++ .../Views/MessengerPage.xaml | 28 ++ .../Views/MessengerPage.xaml.cs | 19 ++ .../Views/MessengerRequestPage.xaml | 92 +++++ .../Views/MessengerRequestPage.xaml.cs | 34 ++ .../Views/MessengerSendPage.xaml | 122 +++++++ .../Views/MessengerSendPage.xaml.cs | 34 ++ .../Views/ObservableObjectPage.xaml | 107 ++++++ .../Views/ObservableObjectPage.xaml.cs | 19 ++ .../Views/PuttingThingsTogetherPage.xaml | 28 ++ .../Views/PuttingThingsTogetherPage.xaml.cs | 19 ++ .../Views/RedditBrowserPage.xaml | 315 ++++++++++++++++++ .../Views/RedditBrowserPage.xaml.cs | 19 ++ .../Views/RedditServicePage.xaml | 27 ++ .../Views/RedditServicePage.xaml.cs | 19 ++ .../Views/RelayCommandPage.xaml | 87 +++++ .../Views/RelayCommandPage.xaml.cs | 19 ++ .../Views/SettingUpTheViewModelsPage.xaml | 27 ++ .../Views/SettingUpTheViewModelsPage.xaml.cs | 19 ++ .../Views/SettingsServicePage.xaml | 27 ++ .../Views/SettingsServicePage.xaml.cs | 19 ++ .../Views/Widgets/PostWidget.xaml | 76 +++++ .../Views/Widgets/PostWidget.xaml.cs | 18 + .../Views/Widgets/SubredditWidget.xaml | 113 +++++++ .../Views/Widgets/SubredditWidget.xaml.cs | 16 + samples/NuGet.config | 1 + 47 files changed, 2292 insertions(+), 49 deletions(-) create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/FileService.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/SettingsService.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/AsyncRelayCommandPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/AsyncRelayCommandPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/BuildingTheUIPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/BuildingTheUIPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/IntroductionPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/IntroductionPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/IocPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/IocPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/MessengerPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/MessengerPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/MessengerRequestPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/MessengerRequestPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/MessengerSendPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/MessengerSendPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/ObservableObjectPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/ObservableObjectPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/PuttingThingsTogetherPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/PuttingThingsTogetherPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/RedditBrowserPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/RedditBrowserPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/RedditServicePage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/RedditServicePage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/RelayCommandPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/RelayCommandPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/SettingUpTheViewModelsPage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/SettingUpTheViewModelsPage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/SettingsServicePage.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/SettingsServicePage.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/Widgets/PostWidget.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/Widgets/PostWidget.xaml.cs create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/Widgets/SubredditWidget.xaml create mode 100644 samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/Widgets/SubredditWidget.xaml.cs diff --git a/samples/MvvmSample.Core/MvvmSample.Core.csproj b/samples/MvvmSample.Core/MvvmSample.Core.csproj index 9be1ede5..16dffe5e 100644 --- a/samples/MvvmSample.Core/MvvmSample.Core.csproj +++ b/samples/MvvmSample.Core/MvvmSample.Core.csproj @@ -44,7 +44,7 @@ - + diff --git a/samples/MvvmSample.Core/ViewModels/SamplePageViewModel.cs b/samples/MvvmSample.Core/ViewModels/SamplePageViewModel.cs index 3bd766b0..e5cfdfd3 100644 --- a/samples/MvvmSample.Core/ViewModels/SamplePageViewModel.cs +++ b/samples/MvvmSample.Core/ViewModels/SamplePageViewModel.cs @@ -19,6 +19,7 @@ namespace MvvmSample.Core.ViewModels public class SamplePageViewModel : ObservableObject { private IReadOnlyDictionary texts; + /// /// The instance currently in use. /// @@ -59,7 +60,7 @@ private async Task LoadDocsAsync(string name) // Skip if the loading has already started if (!(LoadDocsCommand.ExecutionTask is null)) return; - var path = Path.Combine("Assets", "docs", $"{name}.md"); + var path = Path.Combine("Assets", $"{name}.md"); using var stream = await FilesServices.OpenForReadAsync(path); using var reader = new StreamReader(stream); var text = await reader.ReadToEndAsync(); diff --git a/samples/MvvmSampleWinUI3Desktop.sln b/samples/MvvmSampleWinUI3Desktop.sln index c2696b66..e821f572 100644 --- a/samples/MvvmSampleWinUI3Desktop.sln +++ b/samples/MvvmSampleWinUI3Desktop.sln @@ -5,18 +5,28 @@ VisualStudioVersion = 16.0.31004.235 MinimumVisualStudioVersion = 10.0.40219.1 Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MvvmSampleWinUI3Desktop (Package)", "MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop (Package)\MvvmSampleWinUI3Desktop (Package).wapproj", "{8E012FC5-B17A-4E98-A8CA-ED7571F9274E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmSampleWinUI3Desktop", "MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop.csproj", "{CB559D9F-B686-49EC-814C-FA7DC1912497}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmSampleWinUI3Desktop", "MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop\MvvmSampleWinUI3Desktop.csproj", "{CB559D9F-B686-49EC-814C-FA7DC1912497}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmSample.Core", "MvvmSample.Core\MvvmSample.Core.csproj", "{4437A937-EB2A-4A46-9588-E2DF5E52D647}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmSampleUwp", "MvvmSampleUwp\MvvmSampleUwp.csproj", "{E667FBF4-30F2-49AC-8576-7A2B867F8F1A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM = Debug|ARM Debug|arm64 = Debug|arm64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM = Release|ARM Release|arm64 = Release|arm64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|ARM.ActiveCfg = Debug|x86 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|arm64.ActiveCfg = Debug|arm64 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|arm64.Build.0 = Debug|arm64 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|arm64.Deploy.0 = Debug|arm64 @@ -26,6 +36,8 @@ Global {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x86.ActiveCfg = Debug|x86 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x86.Build.0 = Debug|x86 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Debug|x86.Deploy.0 = Debug|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|Any CPU.ActiveCfg = Release|x86 + {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|ARM.ActiveCfg = Release|x86 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|arm64.ActiveCfg = Release|arm64 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|arm64.Build.0 = Release|arm64 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|arm64.Deploy.0 = Release|arm64 @@ -35,18 +47,68 @@ Global {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x86.ActiveCfg = Release|x86 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x86.Build.0 = Release|x86 {8E012FC5-B17A-4E98-A8CA-ED7571F9274E}.Release|x86.Deploy.0 = Release|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|Any CPU.ActiveCfg = Debug|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|ARM.ActiveCfg = Debug|x86 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|arm64.ActiveCfg = Debug|arm64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|arm64.Build.0 = Debug|arm64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x64.ActiveCfg = Debug|x64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x64.Build.0 = Debug|x64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x86.ActiveCfg = Debug|x86 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Debug|x86.Build.0 = Debug|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|Any CPU.ActiveCfg = Release|x86 + {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|ARM.ActiveCfg = Release|x86 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|arm64.ActiveCfg = Release|arm64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|arm64.Build.0 = Release|arm64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x64.ActiveCfg = Release|x64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x64.Build.0 = Release|x64 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x86.ActiveCfg = Release|x86 {CB559D9F-B686-49EC-814C-FA7DC1912497}.Release|x86.Build.0 = Release|x86 + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|ARM.ActiveCfg = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|ARM.Build.0 = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|arm64.ActiveCfg = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|arm64.Build.0 = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|x64.ActiveCfg = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|x64.Build.0 = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|x86.ActiveCfg = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Debug|x86.Build.0 = Debug|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|Any CPU.Build.0 = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|ARM.ActiveCfg = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|ARM.Build.0 = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|arm64.ActiveCfg = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|arm64.Build.0 = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|x64.ActiveCfg = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|x64.Build.0 = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|x86.ActiveCfg = Release|Any CPU + {4437A937-EB2A-4A46-9588-E2DF5E52D647}.Release|x86.Build.0 = Release|Any CPU + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|ARM.ActiveCfg = Debug|ARM + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|ARM.Build.0 = Debug|ARM + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|ARM.Deploy.0 = Debug|ARM + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|arm64.ActiveCfg = Debug|ARM64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|arm64.Build.0 = Debug|ARM64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|arm64.Deploy.0 = Debug|ARM64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|x64.ActiveCfg = Debug|x64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|x64.Build.0 = Debug|x64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|x64.Deploy.0 = Debug|x64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|x86.ActiveCfg = Debug|x86 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|x86.Build.0 = Debug|x86 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Debug|x86.Deploy.0 = Debug|x86 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|Any CPU.ActiveCfg = Release|x86 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|ARM.ActiveCfg = Release|ARM + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|ARM.Build.0 = Release|ARM + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|ARM.Deploy.0 = Release|ARM + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|arm64.ActiveCfg = Release|ARM64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|arm64.Build.0 = Release|ARM64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|arm64.Deploy.0 = Release|ARM64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|x64.ActiveCfg = Release|x64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|x64.Build.0 = Release|x64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|x64.Deploy.0 = Release|x64 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|x86.ActiveCfg = Release|x86 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|x86.Build.0 = Release|x86 + {E667FBF4-30F2-49AC-8576-7A2B867F8F1A}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj index bd22ac25..8583a3ee 100644 --- a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj @@ -48,6 +48,38 @@ + + Assets\AsyncRelayCommand.md + PreserveNewest + + + Assets\Introduction.md + PreserveNewest + + + Assets\Ioc.md + PreserveNewest + + + Assets\Messenger.md + PreserveNewest + + + Assets\ObservableObject.md + PreserveNewest + + + Assets\ObservableRecipient.md + PreserveNewest + + + Assets\PuttingThingsTogether.md + PreserveNewest + + + Assets\RelayCommand.md + PreserveNewest + @@ -82,6 +114,9 @@ all + + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs index 83deb4e2..0323ad5f 100644 --- a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/App.xaml.cs @@ -1,23 +1,10 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Toolkit.Mvvm.DependencyInjection; using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; -using Microsoft.UI.Xaml.Shapes; +using MvvmSample.Core.Services; +using MvvmSampleUwp.Services; +using Refit; using Windows.ApplicationModel; -using Windows.ApplicationModel.Activation; -using Windows.Foundation; -using Windows.Foundation.Collections; - -// To learn more about WinUI, the WinUI project structure, -// and more about our project templates, see: http://aka.ms/winui-project-info. namespace MvvmSampleWinUI3Desktop { @@ -45,6 +32,14 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar { m_window = new MainWindow(); m_window.Activate(); + + // Register services + Ioc.Default.ConfigureServices( + new ServiceCollection() + .AddSingleton() + .AddSingleton() + .AddSingleton(RestService.For("https://www.reddit.com/")) + .BuildServiceProvider()); } /// diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.cs new file mode 100644 index 00000000..58635ff1 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.cs @@ -0,0 +1,51 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; + +namespace MvvmSampleUwp.Controls +{ + /// + /// A simple control that acts as a frame for an interactive sample. + /// + public sealed class InteractiveSample : ContentControl + { + /// + /// Gets or sets the representing the C# code to display. + /// + public string CSharpCode + { + get => (string)GetValue(CSharpCodeProperty); + set => SetValue(CSharpCodeProperty, $"```csharp\n{value.Trim()}\n```"); + } + + /// + /// The backing . + /// + public static readonly DependencyProperty CSharpCodeProperty = DependencyProperty.Register( + nameof(CSharpCode), + typeof(string), + typeof(InteractiveSample), + new PropertyMetadata(default(string))); + + /// + /// Gets or sets the representing the XAML code to display. + /// + public string XamlCode + { + get => (string)GetValue(XamlCodeProperty); + set => SetValue(XamlCodeProperty, $"```xml\n{value.Trim()}\n```"); + } + + /// + /// The backing . + /// + public static readonly DependencyProperty XamlCodeProperty = DependencyProperty.Register( + nameof(XamlCode), + typeof(string), + typeof(InteractiveSample), + new PropertyMetadata(default(string))); + } +} diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.xaml b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.xaml new file mode 100644 index 00000000..618ee86b --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Controls/InteractiveSample.xaml @@ -0,0 +1,69 @@ + + + + + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml index 0775df97..8acba245 100644 --- a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml @@ -2,12 +2,9 @@ x:Class="MvvmSampleWinUI3Desktop.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:local="using:MvvmSampleWinUI3Desktop" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:mvvmsampleuwp="using:MvvmSampleUwp" mc:Ignorable="d"> - - - - + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs index 6064472e..a36a055f 100644 --- a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MainWindow.xaml.cs @@ -1,20 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Runtime.InteropServices.WindowsRuntime; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Controls; -using Microsoft.UI.Xaml.Controls.Primitives; -using Microsoft.UI.Xaml.Data; -using Microsoft.UI.Xaml.Input; -using Microsoft.UI.Xaml.Media; -using Microsoft.UI.Xaml.Navigation; -using Windows.Foundation; -using Windows.Foundation.Collections; - -// To learn more about WinUI, the WinUI project structure, -// and more about our project templates, see: http://aka.ms/winui-project-info. +using Microsoft.UI.Xaml; namespace MvvmSampleWinUI3Desktop { @@ -27,10 +11,5 @@ public MainWindow() { this.InitializeComponent(); } - - private void myButton_Click(object sender, RoutedEventArgs e) - { - myButton.Content = "Clicked"; - } } } diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj index 3d226f9f..95e1f25f 100644 --- a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop.csproj @@ -1,4 +1,4 @@ - + WinExe net5.0-windows10.0.19041.0 @@ -10,9 +10,91 @@ + + + + + + + + + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/FileService.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/FileService.cs new file mode 100644 index 00000000..60411ae6 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/FileService.cs @@ -0,0 +1,32 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using MvvmSample.Core.Services; +using System; +using System.IO; +using System.Threading.Tasks; +using Windows.ApplicationModel; +using Windows.Storage; + +#nullable enable + +namespace MvvmSampleUwp.Services +{ + /// + /// A that implements the using UWP APIs. + /// + public sealed class FilesService : IFilesService + { + /// + public string InstallationPath => Package.Current.InstalledLocation.Path; + + /// + public async Task OpenForReadAsync(string path) + { + StorageFile file = await StorageFile.GetFileFromPathAsync(Path.Combine(InstallationPath, path)); + + return await file.OpenStreamForReadAsync(); + } + } +} diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/SettingsService.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/SettingsService.cs new file mode 100644 index 00000000..3e8b1964 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Services/SettingsService.cs @@ -0,0 +1,39 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using MvvmSample.Core.Services; +using Windows.Foundation.Collections; +using Windows.Storage; + +namespace MvvmSampleUwp.Services +{ + /// + /// A simple that handles the local app settings. + /// + public sealed class SettingsService : ISettingsService + { + /// + /// The with the settings targeted by the current instance. + /// + private readonly IPropertySet SettingsStorage = ApplicationData.Current.LocalSettings.Values; + + /// + public void SetValue(string key, T value) + { + if (!SettingsStorage.ContainsKey(key)) SettingsStorage.Add(key, value); + else SettingsStorage[key] = value; + } + + /// + public T GetValue(string key) + { + if (SettingsStorage.TryGetValue(key, out object value)) + { + return (T)value; + } + + return default; + } + } +} diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml new file mode 100644 index 00000000..affd74b7 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml.cs b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml.cs new file mode 100644 index 00000000..03e4ae47 --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Shell.xaml.cs @@ -0,0 +1,136 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Navigation; +using MvvmSampleUwp.Views; + +#nullable enable + +namespace MvvmSampleUwp +{ + public sealed partial class Shell : UserControl + { + private readonly IReadOnlyCollection NavigationItems; + + public Shell() + { + this.InitializeComponent(); + + NavigationItems = new[] + { + new SampleEntry(IntroductionItem, typeof(IntroductionPage)), + new SampleEntry(ObservableObjectItem, typeof(ObservableObjectPage), "ObservableObject", "observable inotify property changed propertychanging changing"), + new SampleEntry(CommandsItem, typeof(RelayCommandPage), "RelayCommand and RelayCommand", "commands icommand relaycommand binding"), + new SampleEntry(AsyncCommandsItem, typeof(AsyncRelayCommandPage), "AsyncRelayCommand and AsyncRelayCommand", "asynccommands icommand relaycommand binding asynchronous"), + new SampleEntry(MessengerItem, typeof(MessengerPage), "Messenger and IMessenger", "messenger messaging message receiver recipient"), + new SampleEntry(SendMessagesItem, typeof(MessengerSendPage), "[IMessenger] Send messages", "messenger messaging message receiver recipient send"), + new SampleEntry(RequestMessagesItem, typeof(MessengerRequestPage), "[IMessenger] Request messages", "messenger messaging message receiver recipient request reply"), + new SampleEntry(InversionOfControlItem, typeof(IocPage), "Ioc (Inversion of control)", "ioc inversion control dependency injection service locator"), + new SampleEntry(RedditBrowserOverviewItem, typeof(PuttingThingsTogetherPage), "Putting things together"), + new SampleEntry(ViewModelsSetupItem, typeof(SettingUpTheViewModelsPage), "Setting up the ViewModels"), + new SampleEntry(SettingsServiceItem, typeof(SettingsServicePage), "Settings service"), + new SampleEntry(RedditServiceItem, typeof(RedditServicePage), "Reddit service"), + new SampleEntry(BuildingTheUIItem, typeof(BuildingTheUIPage), "Building the UI"), + new SampleEntry(FinalResultItem, typeof(RedditBrowserPage), "Reddit browser") + }; + } + + // Navigates to a sample page when a button is clicked + private void NavigationView_OnItemInvoked(NavigationView sender, NavigationViewItemInvokedEventArgs args) + { + if (NavigationItems.FirstOrDefault(item => item.Item == args.InvokedItemContainer)?.PageType is Type pageType) + { + NavigationFrame.Navigate(pageType); + } + } + + // Sets whether or not the back button is enabled + private void NavigationFrame_OnNavigated(object sender, NavigationEventArgs e) + { + NavigationView.IsBackEnabled = ((Frame)sender).BackStackDepth > 0; + } + + // Navigates back + private void NavigationView_OnBackRequested(NavigationView sender, NavigationViewBackRequestedEventArgs args) + { + if (NavigationFrame.BackStack.LastOrDefault() is PageStackEntry entry) + { + NavigationView.SelectedItem = NavigationItems.First(item => item.PageType == entry.SourcePageType).Item; + + NavigationFrame.GoBack(); + } + } + + // Select the introduction item when the shell is loaded + private void Shell_OnLoaded(object sender, RoutedEventArgs e) + { + //NavigationView.SelectedItem = IntroductionItem; + + //NavigationFrame.Navigate(typeof(IntroductionPage)); + } + + // Updates the search results + private void SearchBox_OnTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args) + { + if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput) + { + // Not a simple tokenized search, but good enough for now + string query = sender.Text.ToLowerInvariant(); + + sender.ItemsSource = NavigationItems.Where(item => item.Tags?.Contains(query) == true); + } + } + + // Navigates to a selected item + private void AutoSuggestBox_OnSuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args) + { + SampleEntry entry = (SampleEntry)args.SelectedItem; + + NavigationFrame.Navigate(entry.PageType); + + NavigationView.SelectedItem = entry.Item; + + sender.Text = string.Empty; + } + } + + /// + /// A simple model for tracking sample pages associated with buttons. + /// + public sealed class SampleEntry + { + public SampleEntry(NavigationViewItem viewItem, Type pageType, string? name = null, string? tags = null) + { + Item = viewItem; + PageType = pageType; + Name = name; + Tags = tags; + } + + /// + /// The navigation item for the current entry. + /// + public NavigationViewItem Item { get; } + + /// + /// The associated page type for the current entry. + /// + public Type PageType { get; } + + /// + /// Gets the name of the current entry. + /// + public string? Name { get; } + + /// + /// Gets the tag for the current entry, if any. + /// + public string? Tags { get; } + } +} diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/AsyncRelayCommandPage.xaml b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/AsyncRelayCommandPage.xaml new file mode 100644 index 00000000..16d4211d --- /dev/null +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop/Views/AsyncRelayCommandPage.xaml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + public class SamplePageViewModel : ObservableObject { - private IReadOnlyDictionary texts; - - /// - /// The instance currently in use. - /// - private readonly IFilesService FilesServices = Ioc.Default.GetRequiredService(); + private IReadOnlyDictionary? texts; public SamplePageViewModel() { @@ -35,7 +29,10 @@ public SamplePageViewModel() /// public IAsyncRelayCommand LoadDocsCommand { get; } - public IReadOnlyDictionary Texts + /// + /// Gets or sets the collection of loaded paragraphs. + /// + public IReadOnlyDictionary? Texts { get => texts; set => SetProperty(ref texts, value); @@ -55,15 +52,14 @@ public string GetParagraph(string key) /// Implements the logic for . /// /// The name of the docs file to load. - private async Task LoadDocsAsync(string name) + private async Task LoadDocsAsync(string? name) { // Skip if the loading has already started if (!(LoadDocsCommand.ExecutionTask is null)) return; - var path = Path.Combine("Assets", $"{name}.md"); - using var stream = await FilesServices.OpenForReadAsync(path); - using var reader = new StreamReader(stream); - var text = await reader.ReadToEndAsync(); + string + path = Path.Combine("Docs", $"{name!}.md"), + text = await EmbeddedResources.GetStringAsync(Assembly.GetExecutingAssembly(), path); Texts = MarkdownHelper.GetParagraphs(text); diff --git a/samples/MvvmSampleUwp/MvvmSampleUwp.csproj b/samples/MvvmSampleUwp/MvvmSampleUwp.csproj index 935e8b18..2d5354c3 100644 --- a/samples/MvvmSampleUwp/MvvmSampleUwp.csproj +++ b/samples/MvvmSampleUwp/MvvmSampleUwp.csproj @@ -339,40 +339,6 @@ MSBuild:Compile - - - Assets\docs\AsyncRelayCommand.md - PreserveNewest - - - Assets\docs\Introduction.md - PreserveNewest - - - Assets\docs\Ioc.md - PreserveNewest - - - Assets\docs\Messenger.md - PreserveNewest - - - Assets\docs\ObservableObject.md - PreserveNewest - - - Assets\docs\ObservableRecipient.md - PreserveNewest - - - Assets\docs\PuttingThingsTogether.md - PreserveNewest - - - Assets\docs\RelayCommand.md - PreserveNewest - - {28e524f7-61b3-455d-8cbd-615bc4fde814} diff --git a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj index 8583a3ee..bd22ac25 100644 --- a/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj +++ b/samples/MvvmSampleWinUI3Desktop/MvvmSampleWinUI3Desktop (Package)/MvvmSampleWinUI3Desktop (Package).wapproj @@ -48,38 +48,6 @@ - - Assets\AsyncRelayCommand.md - PreserveNewest - - - Assets\Introduction.md - PreserveNewest - - - Assets\Ioc.md - PreserveNewest - - - Assets\Messenger.md - PreserveNewest - - - Assets\ObservableObject.md - PreserveNewest - - - Assets\ObservableRecipient.md - PreserveNewest - - - Assets\PuttingThingsTogether.md - PreserveNewest - - - Assets\RelayCommand.md - PreserveNewest - @@ -114,9 +82,6 @@ all - - -