Reformat code and enable implicit usings

- Renamed universal json to common
This commit is contained in:
Tony Bark 2026-05-16 05:17:42 -04:00
parent 247b738ecc
commit 71cc94e251
10 changed files with 18 additions and 27 deletions

View file

@ -3,6 +3,7 @@
<component name="AvaloniaProject">
<option name="projectPerEditor">
<map>
<entry key="CyberBits/App.axaml" value="CyberBits/CyberBits.csproj" />
<entry key="CyberBits/Views/MainWindow.axaml" value="CyberBits/CyberBits.csproj" />
</map>
</option>

View file

@ -4,12 +4,13 @@
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<RollForward>LatestMajor</RollForward>
<ImplicitUsings>true</ImplicitUsings>
<ApplicationManifest>app.manifest</ApplicationManifest>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>
<ItemGroup>
<None Include="Data\universal.json">
<None Include="Data\common.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Data\cock.json">

View file

@ -4,5 +4,5 @@ public struct DataFiles
{
public const string COCK_JSON = "/Data/cock.json";
public const string PUSSY_JSON = "Data/pussy.json";
public const string UNIVERSAL_JSON = "Data/universal.json";
public const string COMMON_JSON = "Data/common.json";
}

View file

@ -1,5 +1,3 @@
using CommunityToolkit.Mvvm.ComponentModel;
namespace CyberBits;
public enum Genitals

View file

@ -1,5 +1,4 @@
using Avalonia;
using System;
namespace CyberBits;

View file

@ -1,4 +1,3 @@
using System;
using System.Diagnostics.CodeAnalysis;
using Avalonia.Controls;
using Avalonia.Controls.Templates;

View file

@ -1,5 +1,4 @@
using System;
using System.Collections.ObjectModel;
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
namespace CyberBits.ViewModels;

View file

@ -3,8 +3,8 @@
xmlns:vm="using:CyberBits.ViewModels"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="520"
Width="700" Height="520" CanResize="False"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="530"
Width="800" Height="530" CanResize="False"
ExtendClientAreaToDecorationsHint="True"
x:Class="CyberBits.Views.MainWindow"
x:DataType="vm:MainWindowViewModel"
@ -29,7 +29,7 @@
<Image x:Name="BitsImage" Grid.Column="0" Source="avares://CyberBits/Assets/cock.jpg" />
<GridSplitter Grid.Column="1" ResizeDirection="Columns"/>
<StackPanel Grid.Column="1">
<Grid ColumnDefinitions="160,160">
<Grid ColumnDefinitions="200,180">
<GridSplitter ResizeDirection="Columns"/>
<StackPanel Grid.Column="0" >
<ComboBox ItemsSource="{Binding GenitalOptions}"
@ -65,12 +65,6 @@
</StackPanel>
<GridSplitter Grid.Column="1" ResizeDirection="Columns"/>
<StackPanel Grid.Column="1">
<Button Background="Transparent"
HorizontalAlignment="Right"
Width="100"
Height="40">
<Image Source="avares://CyberBits/Assets/game_die.png" />
</Button>
<TextBlock Text="Aesthetics" HorizontalAlignment="Center" />
<ListBox ItemsSource="{Binding AestheticsList}"
SelectedItem="{Binding SelectedAesthetics}"

View file

@ -1,5 +1,3 @@
using System;
using System.IO;
using System.Reflection;
using System.Text.Json;
using Avalonia.Controls;
@ -8,7 +6,8 @@ namespace CyberBits.Views;
public partial class MainWindow : Window
{
string? AppPath => Path.GetDirectoryName(Assembly.GetAssembly(typeof(MainWindow))?.Location);
private string? AppPath => Path.GetDirectoryName(Assembly.GetAssembly(typeof(MainWindow))?.Location);
public MainWindow()
{
@ -16,13 +15,14 @@ public partial class MainWindow : Window
try
{
var univieralFile = File.ReadAllText($"{AppPath}//{DataFiles.UNIVERSAL_JSON}");
var univieralData = JsonSerializer.Deserialize<UniversalModel>(univieralFile);
var commonFile = File.ReadAllText($"{AppPath}//{DataFiles.COMMON_JSON}");
var commonData = JsonSerializer.Deserialize<UniversalModel>(commonFile);
PubesItems.ItemsSource = commonData?.Pubes;
CyberwareItems.ItemsSource = commonData?.Cyberware;
AestheticsItems.ItemsSource = commonData?.Aesthetic;
ButtOptions.ItemsSource = commonData?.Butt;
PubesItems.ItemsSource = univieralData?.Pubes;
CyberwareItems.ItemsSource = univieralData?.Cyberware;
AestheticsItems.ItemsSource = univieralData?.Aesthetic;
ButtOptions.ItemsSource = univieralData?.Butt;
}
catch (Exception e)
{
@ -38,7 +38,7 @@ public partial class MainWindow : Window
}
void GenitalSwap(string image, string data)
private void GenitalSwap(string image, string data)
{
try