Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] IconPackBrowser.Avalonia #6

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

[WIP] IconPackBrowser.Avalonia #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
90dd6ab
WIP IconPackBrowser.Avalonia
timunie Oct 31, 2024
acfb1cc
try using ItemsRepeater
punker76 Nov 1, 2024
70294ea
improve DataTemplate
punker76 Nov 1, 2024
a399f0b
add paginator until we got a virtualized wrappanel
punker76 Nov 2, 2024
abb6b1b
WIP VirtualizingWrapPanel
timunie Nov 11, 2024
57008f9
No idea what to do :shrug:
timunie Nov 12, 2024
27269e6
use first preview of iconpacks avalonia
punker76 Nov 12, 2024
a14dfaa
hover/selection color
punker76 Nov 13, 2024
4574167
Another WrapPanel impl
timunie Nov 14, 2024
e1ca0c5
Oh dear ....
timunie Nov 15, 2024
beb6d1e
it somewhat works now. But how the hack can I remove these ghost items?
timunie Nov 15, 2024
fc9f52e
Use ObservableList as it seems to load quicker
timunie Nov 15, 2024
5314008
MeasureViewPort seems to be useless
timunie Nov 15, 2024
1e95fda
ReactiveUI is gone
punker76 Nov 15, 2024
c7c8d0f
faster navbar loading
punker76 Nov 15, 2024
ce3bb50
just always recycle everything for now. Makes it laggy but worth it j…
timunie Nov 16, 2024
e22f403
Apply filter again
timunie Nov 16, 2024
7eb1c37
Use .NET9 and update dependencies
timunie Nov 19, 2024
fe50d1b
Improve things
timunie Nov 19, 2024
d194aef
finally performant solution
timunie Nov 20, 2024
c1c870e
Fixing export
timunie Nov 20, 2024
4d4aca7
Handle focused item measurement better
timunie Nov 21, 2024
c294f9f
use IconPacks.Avalonia v1.0.0
punker76 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,3 +348,6 @@ MigrationBackup/

# Ionide (cross platform F# VS Code tools) working folder
.ionide/

#Rider
.idea/
28 changes: 28 additions & 0 deletions NuGet.Config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<solution>
<add key="disableSourceControlIntegration" value="true" />
</solution>
<packageRestore>
<add key="enabled" value="True" />
<add key="automatic" value="True" />
</packageRestore>
<packageSources>
<clear />
<!-- <add key="CI.MahApps.IconPacks.Avalonia" value="d:\source\github_orgs\MahApps.Metro.IconPacks\Publish\" /> -->
<add key="CI.MahApps.IconPacks.Avalonia" value="https://ci.appveyor.com/nuget/iconpacks-avalonia" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</packageSources>
<activePackageSource>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
</activePackageSource>
<packageSourceMapping>
<packageSource key="CI.MahApps.IconPacks.Avalonia">
<package pattern="IconPacks.Avalonia*" />
</packageSource>
<packageSource key="nuget.org">
<package pattern="*" />
</packageSource>
</packageSourceMapping>
</configuration>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.403",
"version": "9.0.100",
"rollForward": "feature",
"allowPrerelease": false
}
Expand Down
3 changes: 1 addition & 2 deletions src/AvaloniaApp/App.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
</FluentTheme.Palettes>
</FluentTheme>

<!-- <StyleInclude Source="avares://IconPacks.Avalonia.BoxIcons/BoxIcons.xaml" /> -->
<StyleInclude Source="avares://IconPacks.Avalonia/Icons.xaml" />
<StyleInclude Source="avares://IconPacks.Avalonia/Icons.axaml" />
</Application.Styles>
</Application>
7 changes: 4 additions & 3 deletions src/AvaloniaApp/AvaloniaApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
<PackageReference Include="IconPacks.Avalonia" Version="1.0.0-rc0016" />
</ItemGroup>

<ItemGroup>
<!-- <ProjectReference Include="..\IconPacks.Avalonia.BoxIcons\IconPacks.Avalonia.BoxIcons.csproj" /> -->
<!-- <ItemGroup>
<ProjectReference Include="..\IconPacks.Avalonia.BoxIcons\IconPacks.Avalonia.BoxIcons.csproj" />
<ProjectReference Include="..\IconPacks.Avalonia\IconPacks.Avalonia.csproj" />
</ItemGroup>
</ItemGroup>-->

</Project>
2 changes: 1 addition & 1 deletion src/AvaloniaApp/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:avaloniaApp="clr-namespace:AvaloniaApp"
xmlns:iconPacks="urn:iconpacks-avalonia"
xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="AvaloniaApp.MainWindow"
Title="AvaloniaApp"
Expand Down
70 changes: 70 additions & 0 deletions src/AvaloniaIconPacks.TestApp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconPacks.Avalonia.BoxIcons
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconPacks.Avalonia", "IconPacks.Avalonia\IconPacks.Avalonia.csproj", "{49ECE319-789D-4A0C-9CAF-D79CF6BFEB48}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.IconPacksBrowser.Avalonia", "MahApps.IconPacksBrowser.Avalonia\MahApps.IconPacksBrowser.Avalonia\MahApps.IconPacksBrowser.Avalonia.csproj", "{B04B040D-16F4-4B13-87FF-F3D5458192D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.IconPacksBrowser.Avalonia.Android", "MahApps.IconPacksBrowser.Avalonia\MahApps.IconPacksBrowser.Avalonia.Android\MahApps.IconPacksBrowser.Avalonia.Android.csproj", "{62247BA0-E3C7-40D9-9B45-059FF0861FED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.IconPacksBrowser.Avalonia.Desktop", "MahApps.IconPacksBrowser.Avalonia\MahApps.IconPacksBrowser.Avalonia.Desktop\MahApps.IconPacksBrowser.Avalonia.Desktop.csproj", "{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.IconPacksBrowser.Avalonia.iOS", "MahApps.IconPacksBrowser.Avalonia\MahApps.IconPacksBrowser.Avalonia.iOS\MahApps.IconPacksBrowser.Avalonia.iOS.csproj", "{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.IconPacksBrowser.Avalonia.Browser", "MahApps.IconPacksBrowser.Avalonia\MahApps.IconPacksBrowser.Avalonia.Browser\MahApps.IconPacksBrowser.Avalonia.Browser.csproj", "{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -74,6 +84,66 @@ Global
{49ECE319-789D-4A0C-9CAF-D79CF6BFEB48}.Release|x64.Build.0 = Release|Any CPU
{49ECE319-789D-4A0C-9CAF-D79CF6BFEB48}.Release|x86.ActiveCfg = Release|Any CPU
{49ECE319-789D-4A0C-9CAF-D79CF6BFEB48}.Release|x86.Build.0 = Release|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Debug|x64.ActiveCfg = Debug|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Debug|x64.Build.0 = Debug|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Debug|x86.ActiveCfg = Debug|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Debug|x86.Build.0 = Debug|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Release|Any CPU.Build.0 = Release|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Release|x64.ActiveCfg = Release|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Release|x64.Build.0 = Release|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Release|x86.ActiveCfg = Release|Any CPU
{B04B040D-16F4-4B13-87FF-F3D5458192D9}.Release|x86.Build.0 = Release|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Debug|x64.ActiveCfg = Debug|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Debug|x64.Build.0 = Debug|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Debug|x86.ActiveCfg = Debug|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Debug|x86.Build.0 = Debug|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Release|Any CPU.Build.0 = Release|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Release|x64.ActiveCfg = Release|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Release|x64.Build.0 = Release|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Release|x86.ActiveCfg = Release|Any CPU
{62247BA0-E3C7-40D9-9B45-059FF0861FED}.Release|x86.Build.0 = Release|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Debug|x64.ActiveCfg = Debug|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Debug|x64.Build.0 = Debug|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Debug|x86.ActiveCfg = Debug|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Debug|x86.Build.0 = Debug|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Release|Any CPU.Build.0 = Release|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Release|x64.ActiveCfg = Release|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Release|x64.Build.0 = Release|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Release|x86.ActiveCfg = Release|Any CPU
{FCC36E30-BE04-4C70-A27E-6C34FB3DF99D}.Release|x86.Build.0 = Release|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Debug|x64.ActiveCfg = Debug|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Debug|x64.Build.0 = Debug|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Debug|x86.ActiveCfg = Debug|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Debug|x86.Build.0 = Debug|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Release|Any CPU.Build.0 = Release|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Release|x64.ActiveCfg = Release|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Release|x64.Build.0 = Release|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Release|x86.ActiveCfg = Release|Any CPU
{865C5B7C-FFB5-47EB-AE35-F02A3C5BB0D2}.Release|x86.Build.0 = Release|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Debug|x64.ActiveCfg = Debug|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Debug|x64.Build.0 = Debug|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Debug|x86.ActiveCfg = Debug|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Debug|x86.Build.0 = Debug|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Release|Any CPU.Build.0 = Release|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Release|x64.ActiveCfg = Release|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Release|x64.Build.0 = Release|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Release|x86.ActiveCfg = Release|Any CPU
{B7F2176C-B9F4-44B1-8DD5-369C5AEE41BB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading