mchSamples_.NET
/
mchSamples-MAUI
40
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'toolbar winui' (#1) from toolbarwinui into toolbar

Browse Source 
Reviewed-on: #1
pull/2/head
Marc CHEVALDONNE 7 months ago
parent f866eaccb3 4ca532ad7c
commit b862b64fe1
8 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File

17
Samples.sln
Unescape View File

@ -5,19 +5,19 @@ VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ch03_DataBinding", "ch03_DataBinding", "{E9273679-4D52-465F-8C23-8096DD8C2A7B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_BindingToA2dArray_v1", "ch03_DataBinding\ex_BindingToA2dArray_v1\ex_BindingToA2dArray_v1.csproj", "{AB5CCC4D-10B3-4116-A6B3-D1F720507608}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ex_BindingToA2dArray_v1", "ch03_DataBinding\ex_BindingToA2dArray_v1\ex_BindingToA2dArray_v1.csproj", "{AB5CCC4D-10B3-4116-A6B3-D1F720507608}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_BindingToA2dArray_context", "ch03_DataBinding\ex_BindingToA2dArray_context\ex_BindingToA2dArray_context.csproj", "{43E82F4F-6EBA-4708-A392-1B2E8130A19E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ex_BindingToA2dArray_context", "ch03_DataBinding\ex_BindingToA2dArray_context\ex_BindingToA2dArray_context.csproj", "{43E82F4F-6EBA-4708-A392-1B2E8130A19E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_BindingToA2dArray_v2", "ch03_DataBinding\ex_BindingToA2dArray_v2\ex_BindingToA2dArray_v2.csproj", "{C93C6EF6-C535-44C0-B5BF-0DD4988F3FA4}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ex_BindingToA2dArray_v2", "ch03_DataBinding\ex_BindingToA2dArray_v2\ex_BindingToA2dArray_v2.csproj", "{C93C6EF6-C535-44C0-B5BF-0DD4988F3FA4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ch02_DesigningViews", "ch02_DesigningViews", "{1E07D063-F377-413B-B9A0-FB94AF14B1A9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_ShadowLabel", "ch02_DesigningViews\ex_ShadowLabel\ex_ShadowLabel.csproj", "{62F4D4C2-7C79-4090-BB4B-20F848322113}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ex_ShadowLabel", "ch02_DesigningViews\ex_ShadowLabel\ex_ShadowLabel.csproj", "{62F4D4C2-7C79-4090-BB4B-20F848322113}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_OutlineText", "ch02_DesigningViews\ex_OutlineText\ex_OutlineText.csproj", "{EAD02985-9DBA-459D-B12E-32A89D2C95C5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ex_OutlineText", "ch02_DesigningViews\ex_OutlineText\ex_OutlineText.csproj", "{EAD02985-9DBA-459D-B12E-32A89D2C95C5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ex_Toolbar", "ch02_DesigningViews\ex_Toolbar\ex_Toolbar.csproj", "{0D77C4EE-DD5C-4DCB-8FCB-F3548BDD398C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ex_Toolbar", "ch02_DesigningViews\ex_Toolbar\ex_Toolbar.csproj", "{0D77C4EE-DD5C-4DCB-8FCB-F3548BDD398C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -27,6 +27,7 @@ Global
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AB5CCC4D-10B3-4116-A6B3-D1F720507608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AB5CCC4D-10B3-4116-A6B3-D1F720507608}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AB5CCC4D-10B3-4116-A6B3-D1F720507608}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{AB5CCC4D-10B3-4116-A6B3-D1F720507608}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AB5CCC4D-10B3-4116-A6B3-D1F720507608}.Release|Any CPU.Build.0 = Release|Any CPU
{43E82F4F-6EBA-4708-A392-1B2E8130A19E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@ -35,18 +36,22 @@ Global
{43E82F4F-6EBA-4708-A392-1B2E8130A19E}.Release|Any CPU.Build.0 = Release|Any CPU
{C93C6EF6-C535-44C0-B5BF-0DD4988F3FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C93C6EF6-C535-44C0-B5BF-0DD4988F3FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C93C6EF6-C535-44C0-B5BF-0DD4988F3FA4}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{C93C6EF6-C535-44C0-B5BF-0DD4988F3FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C93C6EF6-C535-44C0-B5BF-0DD4988F3FA4}.Release|Any CPU.Build.0 = Release|Any CPU
{62F4D4C2-7C79-4090-BB4B-20F848322113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62F4D4C2-7C79-4090-BB4B-20F848322113}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62F4D4C2-7C79-4090-BB4B-20F848322113}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{62F4D4C2-7C79-4090-BB4B-20F848322113}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62F4D4C2-7C79-4090-BB4B-20F848322113}.Release|Any CPU.Build.0 = Release|Any CPU
{EAD02985-9DBA-459D-B12E-32A89D2C95C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EAD02985-9DBA-459D-B12E-32A89D2C95C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EAD02985-9DBA-459D-B12E-32A89D2C95C5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{EAD02985-9DBA-459D-B12E-32A89D2C95C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EAD02985-9DBA-459D-B12E-32A89D2C95C5}.Release|Any CPU.Build.0 = Release|Any CPU
{0D77C4EE-DD5C-4DCB-8FCB-F3548BDD398C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0D77C4EE-DD5C-4DCB-8FCB-F3548BDD398C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0D77C4EE-DD5C-4DCB-8FCB-F3548BDD398C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0D77C4EE-DD5C-4DCB-8FCB-F3548BDD398C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0D77C4EE-DD5C-4DCB-8FCB-F3548BDD398C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection

2
ch02_DesigningViews/ex_OutlineText/ex_OutlineText.csproj
Unescape View File

@ -24,7 +24,7 @@
<ApplicationTitle>ex_OutlineText</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_outlinetext</ApplicationId>
<ApplicationId>com.companyname.exoutlinetext</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

2
ch02_DesigningViews/ex_ShadowLabel/ex_ShadowLabel.csproj
Unescape View File

@ -24,7 +24,7 @@
<ApplicationTitle>ex_OutlineText</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_outlinetext</ApplicationId>
<ApplicationId>com.companyname.exoutlinetext</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

11
ch02_DesigningViews/ex_Toolbar/MainPage.xaml
Unescape View File

@ -2,22 +2,21 @@
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="ex_Toolbar.MainPage"
Shell.ForegroundColor="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}"
Shell.TitleColor="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}">
Shell.TitleColor="{AppThemeBinding Light={StaticResource Primary}, Dark=Red}">
<ContentPage.ToolbarItems>
<ToolbarItem Text="Info"
IconImageSource="{OnPlatform 'info_circle.png', Android={AppThemeBinding Light='info_circle_primary.png', Dark='info_circle_primarydark.png'}}"
IconImageSource="{OnPlatform 'info_circle.png', WinUI={AppThemeBinding Light='info_circle_primary.png', Dark='info_circle_primarydark.png'}}"
Order="Primary"/>
<ToolbarItem Text="Rabbit"
IconImageSource="{OnPlatform 'hare.png', Android={AppThemeBinding Light='hare_primary.png', Dark='hare_primarydark.png'}}"
IconImageSource="{OnPlatform 'hare.png', WinUI={AppThemeBinding Light='hare_primary.png', Dark='hare_primarydark.png'}}"
Order="Primary"/>
<ToolbarItem Text="More"
Order="Primary"/>
<ToolbarItem Text="Blabla"
IconImageSource="{OnPlatform 'captions_bubble.png', Android={AppThemeBinding Light='captions_bubble_primary.png', Dark='captions_bubble_primarydark.png'}}"
IconImageSource="{OnPlatform 'captions_bubble.png', WinUI={AppThemeBinding Light='captions_bubble_primary.png', Dark='captions_bubble_primarydark.png'}}"
Order="Secondary"/>
<ToolbarItem Text="Blabla Quotes"
IconImageSource="{OnPlatform 'quote_bubble.png', Android={AppThemeBinding Light='quote_bubble_primary.png', Dark='quote_bubble_primarydark.png'}}"
IconImageSource="{OnPlatform 'quote_bubble.png', WinUI={AppThemeBinding Light='quote_bubble_primary.png', Dark='quote_bubble_primarydark.png'}}"
Order="Secondary"/>
</ContentPage.ToolbarItems>
<ScrollView>

8
ch02_DesigningViews/ex_Toolbar/Resources/Images/splash.svg
Unescape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="456" height="456" viewBox="0 0 456 456" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<path d="m 105.50037,281.60863 c -2.70293,0 -5.00091,-0.90042 -6.893127,-2.70209 -1.892214,-1.84778 -2.837901,-4.04181 -2.837901,-6.58209 0,-2.58722 0.945687,-4.80389 2.837901,-6.65167 1.892217,-1.84778 4.190197,-2.77167 6.893127,-2.77167 2.74819,0 5.06798,0.92389 6.96019,2.77167 1.93749,1.84778 2.90581,4.06445 2.90581,6.65167 0,2.54028 -0.96832,4.73431 -2.90581,6.58209 -1.89221,1.80167 -4.212,2.70209 -6.96019,2.70209 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 213.56111,280.08446 H 195.99044 L 149.69953,207.0544 c -1.17121,-1.84778 -2.14037,-3.76515 -2.90581,-5.75126 h -0.40578 c 0.36051,2.12528 0.54076,6.67515 0.54076,13.6496 v 65.13172 h -15.54349 v -99.36009 h 18.71925 l 44.7374,71.29798 c 1.89222,2.95695 3.1087,4.98917 3.64945,6.09751 h 0.26996 c -0.45021,-2.6325 -0.67573,-7.09015 -0.67573,-13.37293 v -64.02256 h 15.47557 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="m 289.25134,280.08446 h -54.40052 v -99.36009 h 52.23835 v 13.99669 h -36.15411 v 28.13085 h 33.31621 v 13.9271 h -33.31621 v 29.37835 h 38.31628 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
<path d="M 366.56466,194.72106 H 338.7222 v 85.3634 h -16.08423 v -85.3634 h -27.77455 v -13.99669 h 71.70124 z" style="fill:#ffffff;fill-rule:nonzero;stroke-width:0.838376" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

27
ch02_DesigningViews/ex_Toolbar/ex_Toolbar.csproj
Unescape View File

@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net8.0-maccatalyst</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
@ -16,7 +15,6 @@
<OutputType>Exe</OutputType>
<RootNamespace>ex_Toolbar</RootNamespace>
<UseMaui>true</UseMaui>
<MauiVersion>8.0.14</MauiVersion>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
@ -25,7 +23,7 @@
<ApplicationTitle>ex_Toolbar</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_toolbar</ApplicationId>
<ApplicationId>com.companyname.extoolbar</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
@ -39,9 +37,17 @@
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
<MauiSplashScreen Include="Resources\Images\splash.svg">
<Color>#512BD4</Color>
<BaseSize>128,128</BaseSize>
</MauiSplashScreen>
<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
@ -49,6 +55,7 @@
<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
<MauiImage Update="Resources\Images\splash.svg" BaseSize="208,208" />
<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />
@ -58,8 +65,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<MauiImage Remove="Resources\Images\splash.svg" />
</ItemGroup>
<ItemGroup>
<None Remove="Resources\Images\splash.svg" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.21" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.21" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>

2
ch03_DataBinding/ex_BindingToA2dArray_v1/ex_BindingToA2dArray_v1.csproj
Unescape View File

@ -24,7 +24,7 @@
<ApplicationTitle>ex_BindingToA2dArray_v1</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_bindingtoa2darray_v1</ApplicationId>
<ApplicationId>com.companyname.ex-bindingtoa2darray-v1</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

2
ch03_DataBinding/ex_BindingToA2dArray_v2/ex_BindingToA2dArray_v2.csproj
Unescape View File

@ -24,7 +24,7 @@
<ApplicationTitle>ex_BindingToA2dArray_v2</ApplicationTitle>
<!-- App Identifier -->
<ApplicationId>com.companyname.ex_bindingtoa2darray_v2</ApplicationId>
<ApplicationId>com.companyname.ex-bindingtoa2darray-v2</ApplicationId>
<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>

Write Preview
Loading…
Cancel
Save