Use projects + polishing

block-core · Dec 18, 2024 · 78680e1 · 78680e1
1 parent 688bbaa
commit 78680e1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 52 deletions.
diff --git a/src/Angor.Avalonia.sln b/src/Angor.Avalonia.sln
@@ -14,10 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Angor\Avalonia\Directory.Packages.props = Angor\Avalonia\Directory.Packages.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zafiro.Avalonia", "..\..\..\SuperJMN-Zafiro\Zafiro.Avalonia\src\Zafiro.Avalonia\Zafiro.Avalonia.csproj", "{876671F5-3DC4-4729-AFF7-5FA756B5CB44}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zafiro.Avalonia.Dialogs", "..\..\..\SuperJMN-Zafiro\Zafiro.Avalonia\src\Zafiro.Avalonia.Dialogs\Zafiro.Avalonia.Dialogs.csproj", "{8C652C8A-91DE-42B1-8B7A-AD788A191C05}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -36,14 +32,6 @@ Global
 		{0A7F0377-628B-41A8-8849-00A3664B69B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A7F0377-628B-41A8-8849-00A3664B69B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A7F0377-628B-41A8-8849-00A3664B69B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{876671F5-3DC4-4729-AFF7-5FA756B5CB44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{876671F5-3DC4-4729-AFF7-5FA756B5CB44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{876671F5-3DC4-4729-AFF7-5FA756B5CB44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{876671F5-3DC4-4729-AFF7-5FA756B5CB44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C652C8A-91DE-42B1-8B7A-AD788A191C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C652C8A-91DE-42B1-8B7A-AD788A191C05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C652C8A-91DE-42B1-8B7A-AD788A191C05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C652C8A-91DE-42B1-8B7A-AD788A191C05}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Angor/Avalonia/AngorApp/AngorApp.csproj b/src/Angor/Avalonia/AngorApp/AngorApp.csproj
@@ -31,13 +31,8 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-<!--        <PackageReference Include="Zafiro.Avalonia"/>-->
-<!--        <PackageReference Include="Zafiro.Avalonia.Dialogs"/>-->
+        <PackageReference Include="Zafiro.Avalonia"/>
+        <PackageReference Include="Zafiro.Avalonia.Dialogs"/>
 
     </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\..\..\SuperJMN-Zafiro\Zafiro.Avalonia\src\Zafiro.Avalonia.Dialogs\Zafiro.Avalonia.Dialogs.csproj" />
-      <ProjectReference Include="..\..\..\..\..\..\SuperJMN-Zafiro\Zafiro.Avalonia\src\Zafiro.Avalonia\Zafiro.Avalonia.csproj" />
-    </ItemGroup>
 </Project>
diff --git a/...a/AngorApp/Sections/Browse/Details/Invest/TransactionPreview/TransactionPreviewView.axaml b/...a/AngorApp/Sections/Browse/Details/Invest/TransactionPreview/TransactionPreviewView.axaml
@@ -7,7 +7,7 @@
              xmlns:designTime="clr-namespace:Zafiro.Avalonia.DesignTime;assembly=Zafiro.Avalonia"
              xmlns:controls="clr-namespace:AngorApp.Controls"
              xmlns:dp="clr-namespace:AvaloniaProgressRing;assembly=AvaloniaProgressRing"
-             mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="AngorApp.Sections.Browse.Details.Invest.TransactionPreview.TransactionPreviewView"
              x:DataType="transactionPreview:ITransactionPreviewViewModel">
 
@@ -26,7 +26,7 @@
     </UserControl.Styles>
 
     <Panel VerticalAlignment="Center">
-        <Panel IsVisible="{Binding !TransactionConfirmed^}">
+        <Panel IsVisible="{Binding !TransactionConfirmed^}" HorizontalAlignment="Center">
             <StackPanel IsVisible="{Binding !!Transaction}" Spacing="10">
                 <TextBlock TextAlignment="Center" Padding="10">
                     <Run>This is a preview of the transaction you will send.</Run>
@@ -45,7 +45,7 @@
                 </Button>
                 <TextBlock Opacity="{Binding Confirm.IsExecuting^}" HorizontalAlignment="Center" Text="Confirming transaction..." />
             </StackPanel>
-            <StackPanel IsVisible="{Binding CreateTransaction.IsExecuting^}">
+            <StackPanel HorizontalAlignment="Center" IsVisible="{Binding CreateTransaction.IsExecuting^}">
                 <TextBlock Text="Building transaction preview. Please wait." TextAlignment="Center" />
                 <dp:ProgressRing Margin="20" Height="60" Width="60" HorizontalAlignment="Stretch" />
             </StackPanel>

diff --git a/src/Angor/Avalonia/Directory.Packages.props b/src/Angor/Avalonia/Directory.Packages.props
@@ -1,32 +1,32 @@
 <Project>
-    <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-    <PropertyGroup>
-        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    </PropertyGroup>
-    <ItemGroup>
-        <!-- Avalonia packages -->
-        <!-- Important: keep version in sync! -->
-        <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.3.0"/>
-        <PackageVersion Include="Avalonia" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.Svg" Version="11.2.0.2"/>
-        <PackageVersion Include="Avalonia.Svg.Skia" Version="11.2.0.2"/>
-        <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.Desktop" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.iOS" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.Browser" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.Android" Version="11.2.2"/>
-        <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1"/>
-        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2"/>
-        <PackageVersion Include="Deadpikle.AvaloniaProgressRing" Version="0.10.10"/>
-        <PackageVersion Include="Humanizer.Core" Version="2.14.1"/>
-        <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.5.0"/>
-        <PackageVersion Include="ReactiveUI" Version="20.1.63"/>
-        <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.0.17"/>
-        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1"/>
-        <PackageVersion Include="Zafiro.Avalonia" Version="15.0.1"/>
-        <PackageVersion Include="Zafiro.Avalonia.Dialogs" Version="15.0.1"/>
-    </ItemGroup>
+  <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Avalonia packages -->
+    <!-- Important: keep version in sync! -->
+    <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.3.0" />
+    <PackageVersion Include="Avalonia" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.2.0.2" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.iOS" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.Browser" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.Android" Version="11.2.2" />
+    <PackageVersion Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+    <PackageVersion Include="Deadpikle.AvaloniaProgressRing" Version="0.10.10" />
+    <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
+    <PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.5.0" />
+    <PackageVersion Include="ReactiveUI" Version="20.1.63" />
+    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.0.17" />
+    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
+    <PackageVersion Include="Zafiro.Avalonia" Version="16.0.0" />
+    <PackageVersion Include="Zafiro.Avalonia.Dialogs" Version="16.0.0" />
+  </ItemGroup>
 </Project>