Compare commits

..

1 Commits

Author SHA1 Message Date
Ghander
6aa57fbc21 test code to fix the java build errors 2025-06-30 23:06:02 -05:00
4 changed files with 18 additions and 19 deletions

View File

@ -7,7 +7,7 @@ on:
- '**/*.md' - '**/*.md'
- '**/*.gitignore' - '**/*.gitignore'
- '**/*.gitattributes' - '**/*.gitattributes'
pull_request_target: pull_request:
branches: branches:
- master - master

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net8.0-android;</TargetFrameworks> <TargetFrameworks>net8.0-android</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux'))">net8.0-android;</TargetFrameworks> <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('linux'))">net8.0-android</TargetFrameworks>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>BTCPayApp.Maui</RootNamespace> <RootNamespace>BTCPayApp.Maui</RootNamespace>
<UseMaui>true</UseMaui> <UseMaui>true</UseMaui>
@ -35,6 +35,8 @@
<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'"> <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
<AndroidUseAapt2>True</AndroidUseAapt2> <AndroidUseAapt2>True</AndroidUseAapt2>
<AndroidEnableMultiDex>true</AndroidEnableMultiDex>
<JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
<AndroidEnableMultiDex>False</AndroidEnableMultiDex> <AndroidEnableMultiDex>False</AndroidEnableMultiDex>
<AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi>
<AndroidPackageFormat>apk</AndroidPackageFormat> <AndroidPackageFormat>apk</AndroidPackageFormat>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:supportsRtl="true"> <application android:name="android.support.multidex.MultiDexApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:supportsRtl="true">
<service android:name=".HubConnectionForegroundService" android:enabled="true" android:exported="false"/> <service android:name=".HubConnectionForegroundService" android:enabled="true" android:exported="false"/>
</application> </application>
<queries> <queries>

View File

@ -98,21 +98,18 @@
</button> </button>
} }
</div> </div>
<button class="btn btn-lg btn-primary mx-3" type="submit" disabled="@(IsSubmitting || amount == 0)" id="pay-button" @onclick="HandleSubmit">
<div class="d-flex justify-content-center"> @if (IsSubmitting)
<button class="btn btn-lg btn-primary mx-3" type="submit" disabled="@(IsSubmitting || amount == 0)" id="pay-button" @onclick="HandleSubmit"> {
@if (IsSubmitting) <div class="spinner-border spinner-border-sm" role="status">
{ <span class="visually-hidden">Loading...</span>
<div class="spinner-border spinner-border-sm" role="status"> </div>
<span class="visually-hidden">Loading...</span> }
</div> else
} {
else <span>Charge</span>
{ }
<span>Charge</span> </button>
}
</button>
</div>
@if (CanAccessRecentTransactions) @if (CanAccessRecentTransactions)
{ {