Windows - Build Fixes

nlogozzo · nlogozzo · commit d22ff2bd5c2c · 2024-02-05T12:01:50.000-05:00
diff --git a/.gitattributes b/.gitattributes
@@ -5,5 +5,7 @@
 *.ico binary
 *.pdf binary
 *.exe binary
+*.otf binary
+*.ttf binary
 # Exclude Docs From Stats
 docs/** linguist-documentation
diff --git a/libdenaro/src/models/currencyconversionservice.cpp b/libdenaro/src/models/currencyconversionservice.cpp
@@ -1,4 +1,5 @@
 #include "models/currencyconversionservice.h"
+#include <cstdint>
 #include <chrono>
 #include <filesystem>
 #include <fstream>
@@ -33,8 +34,8 @@ namespace Nickvision::Money::Shared::Models
         {
             std::ifstream in{ path };
             in >> json;
-            long seconds{ json.get("time_next_update_unix", 0).asInt64() };
-            long secondsNow{ std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count() };
+            std::int64_t seconds{ json.get("time_next_update_unix", 0).asInt64() };
+            std::int64_t secondsNow{ std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count() };
             if(seconds <= secondsNow)
             {
                 needsUpdate = true;
diff --git a/org.nickvision.money.winui/App.idl b/org.nickvision.money.winui/App.idl
@@ -1,3 +1,3 @@
-namespace Nickvision.Application.WinUI
+namespace Nickvision.Money.WinUI
 {
 }
diff --git a/org.nickvision.money.winui/App.xaml b/org.nickvision.money.winui/App.xaml
@@ -1,5 +1,5 @@
 <Application
-    x:Class="Nickvision.Application.WinUI.App"
+    x:Class="Nickvision.Money.WinUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
diff --git a/org.nickvision.money.winui/Controls/SettingsRow.idl b/org.nickvision.money.winui/Controls/SettingsRow.idl
@@ -1,4 +1,4 @@
-namespace Nickvision.Application.WinUI.Controls
+namespace Nickvision.Money.WinUI.Controls
 {
     [default_interface]
     runtimeclass SettingsRow : Microsoft.UI.Xaml.Controls.UserControl, Microsoft.UI.Xaml.Data.INotifyPropertyChanged
diff --git a/org.nickvision.money.winui/Controls/SettingsRow.xaml b/org.nickvision.money.winui/Controls/SettingsRow.xaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Nickvision.Application.WinUI.Controls.SettingsRow"
+    x:Class="Nickvision.Money.WinUI.Controls.SettingsRow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Nickvision.Application.WinUI.Controls"
+    xmlns:local="using:Nickvision.Money.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
diff --git a/org.nickvision.money.winui/Controls/StatusPage.idl b/org.nickvision.money.winui/Controls/StatusPage.idl
@@ -1,4 +1,4 @@
-namespace Nickvision.Application.WinUI.Controls
+namespace Nickvision.Money.WinUI.Controls
 {
     [default_interface]
     runtimeclass StatusPage : Microsoft.UI.Xaml.Controls.UserControl, Microsoft.UI.Xaml.Data.INotifyPropertyChanged
diff --git a/org.nickvision.money.winui/Controls/StatusPage.xaml b/org.nickvision.money.winui/Controls/StatusPage.xaml
@@ -1,8 +1,8 @@
 <UserControl
-    x:Class="Nickvision.Application.WinUI.Controls.StatusPage"
+    x:Class="Nickvision.Money.WinUI.Controls.StatusPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Nickvision.Application.WinUI.Controls"
+    xmlns:local="using:Nickvision.Money.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d" HorizontalAlignment="Center" VerticalAlignment="Center">
diff --git a/org.nickvision.money.winui/Controls/ViewStack.idl b/org.nickvision.money.winui/Controls/ViewStack.idl
@@ -1,4 +1,4 @@
-namespace Nickvision.Application.WinUI.Controls
+namespace Nickvision.Money.WinUI.Controls
 {
     [default_interface]
     runtimeclass ViewStack : Microsoft.UI.Xaml.Controls.Frame
diff --git a/org.nickvision.money.winui/Controls/ViewStack.xaml b/org.nickvision.money.winui/Controls/ViewStack.xaml
@@ -1,8 +1,8 @@
 <Frame
-    x:Class="Nickvision.Application.WinUI.Controls.ViewStack"
+    x:Class="Nickvision.Money.WinUI.Controls.ViewStack"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Nickvision.Application.WinUI.Controls"
+    xmlns:local="using:Nickvision.Money.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
diff --git a/org.nickvision.money.winui/Controls/ViewStackPage.idl b/org.nickvision.money.winui/Controls/ViewStackPage.idl
@@ -1,4 +1,4 @@
-namespace Nickvision.Application.WinUI.Controls
+namespace Nickvision.Money.WinUI.Controls
 {
     [default_interface]
     runtimeclass ViewStackPage : Microsoft.UI.Xaml.Controls.Frame
diff --git a/org.nickvision.money.winui/Controls/ViewStackPage.xaml b/org.nickvision.money.winui/Controls/ViewStackPage.xaml
@@ -1,8 +1,8 @@
 <Frame
-    x:Class="Nickvision.Application.WinUI.Controls.ViewStackPage"
+    x:Class="Nickvision.Money.WinUI.Controls.ViewStackPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Nickvision.Application.WinUI.Controls"
+    xmlns:local="using:Nickvision.Money.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
diff --git a/org.nickvision.money.winui/MainWindow.idl b/org.nickvision.money.winui/MainWindow.idl
@@ -1,4 +1,4 @@
-namespace Nickvision.Application.WinUI
+namespace Nickvision.Money.WinUI
 {
     [default_interface]
     runtimeclass MainWindow : Microsoft.UI.Xaml.Window
diff --git a/org.nickvision.money.winui/MainWindow.xaml b/org.nickvision.money.winui/MainWindow.xaml
@@ -1,9 +1,9 @@
 <Window
-	x:Class="Nickvision.Application.WinUI.MainWindow"
+	x:Class="Nickvision.Money.WinUI.MainWindow"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="using:Nickvision.Application.WinUI"
-    xmlns:nickvision="using:Nickvision.Application.WinUI.Controls"
+	xmlns:local="using:Nickvision.Money.WinUI"
+    xmlns:nickvision="using:Nickvision.Money.WinUI.Controls"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d" Activated="OnActivated">
diff --git a/org.nickvision.money.winui/MainWindow.xaml.cpp b/org.nickvision.money.winui/MainWindow.xaml.cpp
@@ -167,7 +167,7 @@ namespace winrt::Nickvision::Money::WinUI::implementation
             IVectorView<IStorageItem> items{ co_await args.DataView().GetStorageItemsAsync() };
             if (items.Size() > 0)
             {
-                m_controller->openFolder(winrt::to_string(items.GetAt(0).Path()));
+                
             }
         }
     }
@@ -215,14 +215,7 @@ namespace winrt::Nickvision::Money::WinUI::implementation
             }
             if(args.getAction() == "error")
             {
-                if(m_controller->isFolderOpened())
-                {
-                    NavViewFolder().IsSelected(true);
-                }
-                else
-                {
-                    NavViewHome().IsSelected(true);
-                }
+                NavViewHome().IsSelected(true);
             }
             else if(args.getAction() == "update")
             {
diff --git a/org.nickvision.money.winui/SettingsPage.idl b/org.nickvision.money.winui/SettingsPage.idl
@@ -1,4 +1,4 @@
-namespace Nickvision.Application.WinUI
+namespace Nickvision.Money.WinUI
 {
     [default_interface]
     runtimeclass SettingsPage : Microsoft.UI.Xaml.Controls.UserControl
diff --git a/org.nickvision.money.winui/SettingsPage.xaml b/org.nickvision.money.winui/SettingsPage.xaml
@@ -1,9 +1,9 @@
 <UserControl
-    x:Class="Nickvision.Application.WinUI.SettingsPage"
+    x:Class="Nickvision.Money.WinUI.SettingsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Nickvision.Application.WinUI"
-    xmlns:nickvision="using:Nickvision.Application.WinUI.Controls"
+    xmlns:local="using:Nickvision.Money.WinUI"
+    xmlns:nickvision="using:Nickvision.Money.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-namespace Nickvision.Application.WinUI`
	`1`	`+namespace Nickvision.Money.WinUI`
`2`	`2`	`{`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Nickvision.Application.WinUI.Controls`
	`1`	`+namespace Nickvision.Money.WinUI.Controls`
`2`	`2`	`{`
`3`	`3`	`[default_interface]`
`4`	`4`	`runtimeclass SettingsRow : Microsoft.UI.Xaml.Controls.UserControl, Microsoft.UI.Xaml.Data.INotifyPropertyChanged`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ namespace winrt::Nickvision::Money::WinUI::implementation`
`167`	`167`	`IVectorView<IStorageItem> items{ co_await args.DataView().GetStorageItemsAsync() };`
`168`	`168`	`if (items.Size() > 0)`
`169`	`169`	`{`
`170`		`- m_controller->openFolder(winrt::to_string(items.GetAt(0).Path()));`
	`170`	`+`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`}`
`@@ -215,14 +215,7 @@ namespace winrt::Nickvision::Money::WinUI::implementation`
`215`	`215`	`}`
`216`	`216`	`if(args.getAction() == "error")`
`217`	`217`	`{`
`218`		`- if(m_controller->isFolderOpened())`
`219`		`- {`
`220`		`- NavViewFolder().IsSelected(true);`
`221`		`- }`
`222`		`- else`
`223`		`- {`
`224`		`- NavViewHome().IsSelected(true);`
`225`		`- }`
	`218`	`+ NavViewHome().IsSelected(true);`
`226`	`219`	`}`
`227`	`220`	`else if(args.getAction() == "update")`
`228`	`221`	`{`