diff --git a/BTCPayApp.Desktop/StartupExtensions.cs b/BTCPayApp.Desktop/StartupExtensions.cs index 68092af..d89e0d4 100644 --- a/BTCPayApp.Desktop/StartupExtensions.cs +++ b/BTCPayApp.Desktop/StartupExtensions.cs @@ -78,8 +78,6 @@ public class DesktopConfigProvider : IConfigProvider } } - - public class DesktopDataDirectoryProvider : IDataDirectoryProvider { private readonly IConfiguration _configuration; @@ -90,7 +88,6 @@ public class DesktopDataDirectoryProvider : IDataDirectoryProvider } public virtual Task GetAppDataDirectory() { - var dirName = _configuration.GetValue("BTCPAYAPP_DIRNAME", "BTCPayApp"); return Task.FromResult(GetDirectory(dirName)); } @@ -98,7 +95,6 @@ public class DesktopDataDirectoryProvider : IDataDirectoryProvider private string GetDirectory( string appDirectory) { - var environmentVariable1 = _configuration.GetValue("HOME"); var environmentVariable2 = _configuration.GetValue("APPDATA"); string str; diff --git a/BTCPayApp.Maui/App.xaml b/BTCPayApp.Maui/App.xaml index 9268be4..445175f 100644 --- a/BTCPayApp.Maui/App.xaml +++ b/BTCPayApp.Maui/App.xaml @@ -1,26 +1,11 @@  - - #512bdf - White - - - - - + #FFFFFF + #292929 - \ No newline at end of file + diff --git a/BTCPayApp.Maui/BTCPayApp.Maui.csproj b/BTCPayApp.Maui/BTCPayApp.Maui.csproj index e2b71ef..77b3956 100644 --- a/BTCPayApp.Maui/BTCPayApp.Maui.csproj +++ b/BTCPayApp.Maui/BTCPayApp.Maui.csproj @@ -2,6 +2,8 @@ net7.0-ios;net7.0-android; + net7.0-android; + Exe BTCPayApp.Maui true @@ -10,7 +12,7 @@ false - BTCPayApp.Maui + BTCPay Server org.btcpayserver.BTCPayApp.maui @@ -26,14 +28,13 @@ - + - + - @@ -47,11 +48,13 @@ + diff --git a/BTCPayApp.Maui/MainPage.xaml b/BTCPayApp.Maui/MainPage.xaml index 3b656d4..5835643 100644 --- a/BTCPayApp.Maui/MainPage.xaml +++ b/BTCPayApp.Maui/MainPage.xaml @@ -1,18 +1,13 @@  - + x:Class="BTCPayApp.Maui.MainPage"> - - - \ No newline at end of file + diff --git a/BTCPayApp.Maui/MauiProgram.cs b/BTCPayApp.Maui/MauiProgram.cs index 8f25e94..67de90c 100644 --- a/BTCPayApp.Maui/MauiProgram.cs +++ b/BTCPayApp.Maui/MauiProgram.cs @@ -27,4 +27,4 @@ public static class MauiProgram builder.Services.AddSingleton(); return builder.Build(); } -} \ No newline at end of file +} diff --git a/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml b/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml index e9937ad..c56e7dd 100644 --- a/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml +++ b/BTCPayApp.Maui/Platforms/Android/AndroidManifest.xml @@ -1,6 +1,7 @@  - + - \ No newline at end of file + diff --git a/BTCPayApp.Maui/Platforms/Android/MainActivity.cs b/BTCPayApp.Maui/Platforms/Android/MainActivity.cs index 256936d..60e10c9 100644 --- a/BTCPayApp.Maui/Platforms/Android/MainActivity.cs +++ b/BTCPayApp.Maui/Platforms/Android/MainActivity.cs @@ -1,12 +1,11 @@ using Android.App; using Android.Content.PM; -using Android.OS; -namespace BTCPayApp.Maui; +namespace BTCPayApp.Maui.Platforms.Android; [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)] public class MainActivity : MauiAppCompatActivity { -} \ No newline at end of file +} diff --git a/BTCPayApp.Maui/Platforms/Android/MainApplication.cs b/BTCPayApp.Maui/Platforms/Android/MainApplication.cs index 76b3216..a3e0f4a 100644 --- a/BTCPayApp.Maui/Platforms/Android/MainApplication.cs +++ b/BTCPayApp.Maui/Platforms/Android/MainApplication.cs @@ -1,7 +1,7 @@ using Android.App; using Android.Runtime; -namespace BTCPayApp.Maui; +namespace BTCPayApp.Maui.Platforms.Android; [Application] public class MainApplication : MauiApplication @@ -12,4 +12,4 @@ public class MainApplication : MauiApplication } protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); -} \ No newline at end of file +} diff --git a/BTCPayApp.Maui/Platforms/Android/Resources/values-night/colors.xml b/BTCPayApp.Maui/Platforms/Android/Resources/values-night/colors.xml new file mode 100644 index 0000000..c26b4f0 --- /dev/null +++ b/BTCPayApp.Maui/Platforms/Android/Resources/values-night/colors.xml @@ -0,0 +1,11 @@ + + + + #161B22 + #0D1117 + #FFFFFF + #51B13E + diff --git a/BTCPayApp.Maui/Platforms/Android/Resources/values/colors.xml b/BTCPayApp.Maui/Platforms/Android/Resources/values/colors.xml index c04d749..903fc59 100644 --- a/BTCPayApp.Maui/Platforms/Android/Resources/values/colors.xml +++ b/BTCPayApp.Maui/Platforms/Android/Resources/values/colors.xml @@ -1,6 +1,12 @@ - #512BD4 - #2B0B98 - #2B0B98 - \ No newline at end of file + + #51B13E + diff --git a/BTCPayApp.Maui/Resources/AppIcon/appicon.svg b/BTCPayApp.Maui/Resources/AppIcon/appicon.svg index 9d63b65..54e1061 100644 --- a/BTCPayApp.Maui/Resources/AppIcon/appicon.svg +++ b/BTCPayApp.Maui/Resources/AppIcon/appicon.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/BTCPayApp.Maui/Resources/AppIcon/appiconfg.svg b/BTCPayApp.Maui/Resources/AppIcon/appiconfg.svg index 21dfb25..613174e 100644 --- a/BTCPayApp.Maui/Resources/AppIcon/appiconfg.svg +++ b/BTCPayApp.Maui/Resources/AppIcon/appiconfg.svg @@ -1,8 +1 @@ - - - - - - - - \ No newline at end of file + diff --git a/BTCPayApp.Maui/Resources/Images/dotnet_bot.svg b/BTCPayApp.Maui/Resources/Images/dotnet_bot.svg deleted file mode 100644 index abfaff2..0000000 --- a/BTCPayApp.Maui/Resources/Images/dotnet_bot.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/BTCPayApp.Maui/Resources/Images/logo.svg b/BTCPayApp.Maui/Resources/Images/logo.svg new file mode 100644 index 0000000..fd79260 --- /dev/null +++ b/BTCPayApp.Maui/Resources/Images/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BTCPayApp.Maui/Resources/Splash/splash.svg b/BTCPayApp.Maui/Resources/Splash/splash.svg index 21dfb25..f42102f 100644 --- a/BTCPayApp.Maui/Resources/Splash/splash.svg +++ b/BTCPayApp.Maui/Resources/Splash/splash.svg @@ -1,8 +1 @@ - - - - - - - - \ No newline at end of file + diff --git a/BTCPayApp.Maui/wwwroot/index.html b/BTCPayApp.Maui/wwwroot/index.html new file mode 100644 index 0000000..ba03cdd --- /dev/null +++ b/BTCPayApp.Maui/wwwroot/index.html @@ -0,0 +1,29 @@ + + + + + + BTCPay Server + + + + + + + + +
+ +
Loading...
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
+ + + + + + diff --git a/BTCPayApp.Photino/Program.cs b/BTCPayApp.Photino/Program.cs index 67e1934..97dc243 100644 --- a/BTCPayApp.Photino/Program.cs +++ b/BTCPayApp.Photino/Program.cs @@ -29,7 +29,7 @@ public static class Program .SetResizable(true) .SetZoom(0) // .SetIconFile("favicon.ico") - .SetTitle("BTCPayApp"); + .SetTitle("BTCPay Server"); app.MainWindow.Center(); Size? size = null; diff --git a/BTCPayApp.Photino/wwwroot/index.html b/BTCPayApp.Photino/wwwroot/index.html index c1a6765..57b24dd 100644 --- a/BTCPayApp.Photino/wwwroot/index.html +++ b/BTCPayApp.Photino/wwwroot/index.html @@ -7,9 +7,6 @@ BTCPayApp - - - @@ -27,6 +24,5 @@ - diff --git a/BTCPayApp.Tests/BTCPayAppTestServer.cs b/BTCPayApp.Tests/BTCPayAppTestServer.cs index f1d1d92..7c2daf0 100644 --- a/BTCPayApp.Tests/BTCPayAppTestServer.cs +++ b/BTCPayApp.Tests/BTCPayAppTestServer.cs @@ -13,8 +13,6 @@ using Xunit.Sdk; namespace BTCPayApp.Tests; - - class BTCPayAppTestServer : BaseWebApplicationFactory { public BTCPayAppTestServer(ITestOutputHelper output, bool newDir = true, Dictionary? config = null) : base(output, config) @@ -27,7 +25,6 @@ class BTCPayAppTestServer : BaseWebApplicationFactory } class BaseWebApplicationFactory : WebApplicationFactory where T : class - { protected IHost? _host; protected readonly ITestOutputHelper _output; @@ -52,14 +49,14 @@ class BaseWebApplicationFactory : WebApplicationFactory where T : class _output = output; _config = config ?? new(); - + _playwrightInstallTask ??= Task.Run(InstallPlaywright); } public class LifetimeBridge { - + public LifetimeBridge(IHostApplicationLifetime lifetime, IServer server, TaskCompletionSource tcs ) { lifetime.ApplicationStarted.Register(() => @@ -140,7 +137,7 @@ class BaseWebApplicationFactory : WebApplicationFactory where T : class { Headless = false, }); - + return await Browser.NewContextAsync(new BrowserNewContextOptions()); } @@ -217,4 +214,4 @@ class BaseWebApplicationFactory : WebApplicationFactory where T : class } } } -} \ No newline at end of file +} diff --git a/BTCPayApp.UI/BTCPayApp.UI.csproj b/BTCPayApp.UI/BTCPayApp.UI.csproj index 8c8c2e8..1e811c2 100644 --- a/BTCPayApp.UI/BTCPayApp.UI.csproj +++ b/BTCPayApp.UI/BTCPayApp.UI.csproj @@ -18,10 +18,6 @@
- - - - <_ContentIncludedByDefault Remove="wwwroot\css\open-iconic\FONT-LICENSE" /> <_ContentIncludedByDefault Remove="wwwroot\css\open-iconic\font\css\open-iconic-bootstrap.min.css" /> diff --git a/BTCPayApp.UI/wwwroot/index.html b/BTCPayApp.UI/wwwroot/index.html index d6b4023..3f75cac 100644 --- a/BTCPayApp.UI/wwwroot/index.html +++ b/BTCPayApp.UI/wwwroot/index.html @@ -3,11 +3,11 @@ - BTCPayApp.Maui + BTCPay Server - - - + + + @@ -22,8 +22,8 @@ 🗙 - - + + - \ No newline at end of file +