Skip to content

Commit

Permalink
Fix app icons in Start, taskbar and process list
Browse files Browse the repository at this point in the history
  • Loading branch information
@xirreal
xirreal committed Nov 2, 2024
1 parent 7c371d9 commit 5af193d
Show file tree
Hide file tree
Showing 22 changed files with 136 additions and 86 deletions.
Binary file modified Assets/Icons/AppIcon.scale-100.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Icons/AppIcon.scale-125.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Icons/AppIcon.scale-150.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Icons/AppIcon.scale-200.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Icons/AppIcon.scale-400.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...ppIcon.targetsize-16_altform-unplated.png → Assets/Icons/AppIcon.targetsize-16.png
View file
File renamed without changes
Binary file removed Assets/Icons/AppIcon.targetsize-16_altform-lightunplated.png
View file
Binary file not shown.
0 ...ppIcon.targetsize-24_altform-unplated.png → Assets/Icons/AppIcon.targetsize-24.png
View file
File renamed without changes
Binary file removed Assets/Icons/AppIcon.targetsize-24_altform-lightunplated.png
View file
Binary file not shown.
0 ...pIcon.targetsize-256_altform-unplated.png → Assets/Icons/AppIcon.targetsize-256.png
View file
File renamed without changes
Binary file removed Assets/Icons/AppIcon.targetsize-256_altform-lightunplated.png
View file
Binary file not shown.
0 ...ppIcon.targetsize-32_altform-unplated.png → Assets/Icons/AppIcon.targetsize-32.png
View file
File renamed without changes
Binary file removed Assets/Icons/AppIcon.targetsize-32_altform-lightunplated.png
View file
Binary file not shown.
0 ...ppIcon.targetsize-48_altform-unplated.png → Assets/Icons/AppIcon.targetsize-48.png
View file
File renamed without changes
Binary file removed Assets/Icons/AppIcon.targetsize-48_altform-lightunplated.png
View file
Binary file not shown.
Binary file added Assets/Icons/WideTile.scale-100.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/WideTile.scale-125.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/WideTile.scale-150.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/WideTile.scale-200.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Icons/WideTile.scale-400.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions Package.appxmanifest
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Identity
Name="xirreal.TailscaleClient"
Publisher="CN=TailscaleClient"
Version="1.2.9.0" />
Version="1.3.0.0" />

<mp:PhoneIdentity PhoneProductId="9e756f67-6d0d-4171-a5c1-d5bc42c973ec" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

Expand Down Expand Up @@ -38,9 +38,11 @@
Square150x150Logo="Assets\Icons\AppIcon.png"
BackgroundColor="transparent" Square44x44Logo="Assets\Icons\AppIcon.png"
>
<uap:DefaultTile >
<uap:DefaultTile Square310x310Logo="Assets\Icons\AppIcon.png" Wide310x150Logo="Assets\Icons\WideTile.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo"/>
<uap:ShowOn Tile="square310x310Logo"/>
<uap:ShowOn Tile="wide310x150Logo"/>
</uap:ShowNameOnTiles>
</uap:DefaultTile>
</uap:VisualElements>
Expand Down
216 changes: 132 additions & 84 deletions TailscaleClient.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,77 +34,58 @@
<AppInstallerUri>https://tsc.xirreal.dev</AppInstallerUri>
<DefaultLanguage>en-us</DefaultLanguage>
<AppxPackageDir>C:\Users\xirreal\Workspace\TailscaleClient\Dist</AppxPackageDir>
<ApplicationIcon>Assets\Icons\AppIconBase-Dark.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Content Remove="Assets\AccountCard.xaml" />
<Content Remove="Assets\Android.png" />
<Content Remove="Assets\AppIcon.altform-lightunplated_targetsize-16.png" />
<Content Remove="Assets\AppIcon.altform-lightunplated_targetsize-24.png" />
<Content Remove="Assets\AppIcon.altform-lightunplated_targetsize-256.png" />
<Content Remove="Assets\AppIcon.altform-lightunplated_targetsize-32.png" />
<Content Remove="Assets\AppIcon.altform-lightunplated_targetsize-48.png" />
<Content Remove="Assets\AppIcon.altform-unplated_targetsize-16.png" />
<Content Remove="Assets\AppIcon.altform-unplated_targetsize-24.png" />
<Content Remove="Assets\AppIcon.altform-unplated_targetsize-256.png" />
<Content Remove="Assets\AppIcon.altform-unplated_targetsize-32.png" />
<Content Remove="Assets\AppIcon.altform-unplated_targetsize-48.png" />
<Content Remove="Assets\AppIcon.targetsize-16.png" />
<Content Remove="Assets\AppIcon.targetsize-24.png" />
<Content Remove="Assets\AppIcon.targetsize-32.png" />
<Content Remove="Assets\AppIcon.targetsize-48.png" />
<Content Remove="Assets\Apple.png" />
<Content Remove="Assets\ConfirmDialog.xaml" />
<Content Remove="Assets\ConfirmDialog.xaml.cs" />
<Content Remove="Assets\DeviceCard.xaml" />
<Content Remove="Assets\FeatureTag.xaml" />
<Content Remove="Assets\Icons\AppIcon.altform-lightunplated_targetsize-16.png" />
<Content Remove="Assets\Icons\AppIcon.altform-lightunplated_targetsize-24.png" />
<Content Remove="Assets\Icons\AppIcon.altform-lightunplated_targetsize-256.png" />
<Content Remove="Assets\Icons\AppIcon.altform-lightunplated_targetsize-32.png" />
<Content Remove="Assets\Icons\AppIcon.altform-lightunplated_targetsize-48.png" />
<Content Remove="Assets\Icons\AppIcon.altform-unplated_targetsize-16.png" />
<Content Remove="Assets\Icons\AppIcon.altform-unplated_targetsize-24.png" />
<Content Remove="Assets\Icons\AppIcon.altform-unplated_targetsize-256.png" />
<Content Remove="Assets\Icons\AppIcon.altform-unplated_targetsize-32.png" />
<Content Remove="Assets\Icons\AppIcon.altform-unplated_targetsize-48.png" />
<Content Remove="Assets\Icons\AppIcon.targetsize-16.png" />
<Content Remove="Assets\Icons\AppIcon.targetsize-24.png" />
<Content Remove="Assets\Icons\AppIcon.targetsize-256.png" />
<Content Remove="Assets\Icons\AppIcon.targetsize-32.png" />
<Content Remove="Assets\Icons\AppIcon.targetsize-48.png" />
<Content Remove="Assets\Linux.png" />
<Content Remove="Assets\LoginDialog.xaml" />
<Content Remove="Assets\LoginDialog.xaml.cs" />
<Content Remove="Assets\TailscaleIcon.xaml" />
<Content Remove="Assets\TailscaleIcon.xaml.cs" />
<Content Remove="Assets\Unknown.png" />
<Content Remove="Assets\Windows.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-lightunplated_targetsize-16.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-lightunplated_targetsize-24.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-lightunplated_targetsize-256.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-lightunplated_targetsize-32.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-lightunplated_targetsize-48.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-unplated_targetsize-16.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-unplated_targetsize-24.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-unplated_targetsize-256.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-unplated_targetsize-32.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.altform-unplated_targetsize-48.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.targetsize-16.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.targetsize-24.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.targetsize-256.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.targetsize-32.png" />
<Content Remove="Assets\Icons\Dark\AppIcon.targetsize-48.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-lightunplated_targetsize-16.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-lightunplated_targetsize-24.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-lightunplated_targetsize-256.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-lightunplated_targetsize-32.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-lightunplated_targetsize-48.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-unplated_targetsize-16.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-unplated_targetsize-24.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-unplated_targetsize-256.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-unplated_targetsize-32.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.altform-unplated_targetsize-48.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.targetsize-16.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.targetsize-24.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.targetsize-256.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.targetsize-32.png" />
<Content Remove="Assets\Icons\Dark\Light\AppIcon.targetsize-48.png" />
<Content Remove="Assets\Icons\Dark\Light\SplashScreen.scale-100.png" />
<Content Remove="Assets\Icons\Dark\Light\SplashScreen.scale-125.png" />
<Content Remove="Assets\Icons\Dark\Light\SplashScreen.scale-150.png" />
<Content Remove="Assets\Icons\Dark\Light\SplashScreen.scale-200.png" />
<Content Remove="Assets\Icons\Dark\Light\SplashScreen.scale-400.png" />
<Content Remove="Assets\Icons\Dark\SplashScreen.scale-100.png" />
<Content Remove="Assets\Icons\Dark\SplashScreen.scale-125.png" />
<Content Remove="Assets\Icons\Dark\SplashScreen.scale-150.png" />
<Content Remove="Assets\Icons\Dark\SplashScreen.scale-200.png" />
<Content Remove="Assets\Icons\Dark\SplashScreen.scale-400.png" />
</ItemGroup>
<ItemGroup>
<None Remove="Assets\AccountCard.xaml" />
<None Remove="Assets\ConfirmDialog.xaml" />
<None Remove="Assets\DeviceCard.xaml" />
<None Remove="Assets\FeatureTag.xaml" />
<None Remove="Assets\Icons\AppIcon.scale-100.png" />
<None Remove="Assets\Icons\AppIcon.scale-125.png" />
<None Remove="Assets\Icons\AppIcon.scale-150.png" />
<None Remove="Assets\Icons\AppIcon.scale-200.png" />
<None Remove="Assets\Icons\AppIcon.scale-400.png" />
<None Remove="Assets\Icons\AppIcon.targetsize-16_altform-lightunplated.png" />
<None Remove="Assets\Icons\AppIcon.targetsize-32_altform-lightunplated.png" />
<None Remove="Assets\Icons\AppIcon.targetsize-32_altform-unplated.png" />
<None Remove="Assets\Icons\AppIcon.targetsize-48_altform-lightunplated.png" />
<None Remove="Assets\LoginDialog.xaml" />
<None Remove="Assets\TailscaleIcon.xaml" />
<None Remove="MainWindow.xaml" />
<None Remove="Views\Accounts.xaml" />
<None Remove="Views\AppSkeleton.xaml" />
<None Remove="Views\Error.xaml" />
<None Remove="Views\Home.xaml" />
<None Remove="Views\Settings.xaml" />
<None Remove="Views\TrayMenu.xaml" />
<None Remove="Assets\Icons\WideTile.scale-100.png" />
<None Remove="Assets\Icons\WideTile.scale-125.png" />
<None Remove="Assets\Icons\WideTile.scale-150.png" />
<None Remove="Assets\Icons\WideTile.scale-200.png" />
<None Remove="Assets\Icons\WideTile.scale-400.png" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.1.4" />
Expand All @@ -124,16 +105,91 @@
<ProjectCapability Include="Msix" />
</ItemGroup>
<ItemGroup>
<Content Update="Assets\Android.svg">
<Content Update="Assets\Icons\AppIcon.altform-lightunplated_targetsize-16.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-lightunplated_targetsize-24.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-lightunplated_targetsize-256.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-lightunplated_targetsize-32.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-lightunplated_targetsize-48.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-unplated_targetsize-16.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-unplated_targetsize-24.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-unplated_targetsize-256.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-unplated_targetsize-32.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.altform-unplated_targetsize-48.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.scale-100.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.scale-125.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.scale-150.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.scale-400.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.targetsize-16.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.targetsize-24.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.targetsize-256.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIcon.targetsize-32.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Apple.svg">
<Content Update="Assets\Icons\AppIcon.targetsize-48.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIconBase-Dark.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Linux.svg">
<Content Update="Assets\Icons\AppIconBase-Dark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIconBase-Light.ico">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\AppIconBase-Light.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\WideTile.scale-100.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\WideTile.scale-125.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\WideTile.scale-150.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\WideTile.scale-200.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\WideTile.scale-400.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Misc\Guest.png">
Expand All @@ -154,13 +210,14 @@
<Content Update="Assets\Platforms\Windows.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Icons\Tailscale-AppIcon.png">
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</Content>
<Content Update="Assets\Windows.svg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<None Update="Assets\Icons\AppIconBase-Dark.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<Page Update="Views\Error.xaml">
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
Expand Down Expand Up @@ -199,15 +256,6 @@
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Folder Include="Assets\Misc\" />
</ItemGroup>
<ItemGroup>
<None Update="Assets\Icons\AppIconBase-Dark.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<Page Update="Views\TrayMenu.xaml">
<Generator>MSBuild:Compile</Generator>
Expand Down

0 comments on commit 5af193d

Please sign in to comment.