Skip to content

apply pipboytheme to sample.infinitynavigation #45

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

Merged
NeverMorewd merged 1 commit into from
Mar 26, 2026
Merged

apply pipboytheme to sample.infinitynavigation #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions samples/Sample.InfinityNavigation/App.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="Sample.InfinityNavigation.App"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->

<Application
x:Class="Sample.InfinityNavigation.App"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:pipboy="clr-namespace:Pipboy.Avalonia;assembly=Pipboy.Avalonia"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->

<Application.Styles>
<FluentTheme />
<!--<FluentTheme />-->
<pipboy:PipboyTheme />
</Application.Styles>
</Application>
3 changes: 3 additions & 0 deletions samples/Sample.InfinityNavigation/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Avalonia.Media;
using Microsoft.Extensions.DependencyInjection;
using Pipboy.Avalonia;
using Sample.Common;
using Sample.InfinityNavigation.Views;

Expand All @@ -17,6 +19,7 @@ public override void Initialize()

public override void OnFrameworkInitializationCompleted()
{
PipboyThemeManager.Instance.SetPrimaryColor(Color.Parse("#4CAF50"));
var services = new ServiceCollection();
#pragma warning disable IL2026
services.AddNavigationSupport()
Expand Down
16 changes: 13 additions & 3 deletions samples/Sample.InfinityNavigation/Converters/BoolToBrushConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Avalonia.Data.Converters;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Data.Converters;
using Avalonia.Media;
using System;
using System.Globalization;
Expand All @@ -9,8 +11,16 @@ public class BoolToBrushConverter : IValueConverter
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
var isActvie = (bool)value!;
return isActvie ? Brushes.Orange : Brushes.Gray;
var isActive = (bool)value!;

var key = isActive ? "PipboyBorderBrush" : "PipboyPrimaryDarkBrush";

if (Application.Current!.TryFindResource(key, out var resource))
{
return resource as IBrush;
}

return null;
}

public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
Expand Down
11 changes: 6 additions & 5 deletions samples/Sample.InfinityNavigation/Sample.InfinityNavigation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia" Version="11.3.12" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.12">
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
<PackageReference Include="Pipboy.Avalonia" Version="0.0.3-beta" />
<PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/Sample.InfinityNavigation/Views/InfinityView.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
CommandParameter="InfinityView"
Content="{Binding ButtonText}"
DockPanel.Dock="{Binding InstanceNumber, Converter={StaticResource NumberToDockConverter}}" />
<Border BorderBrush="Red" BorderThickness="1">
<Border>
<Grid>
<ContentControl an:RegionManager.RegionName="{Binding NextRegionName}" />
<TextBlock
Expand Down
Loading