Different QR Code generator

michielpost · May 25, 2024 · a75b789 · a75b789
1 parent a8c0410
commit a75b789
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/aoWebWallet/Pages/ReceivePage.razor b/src/aoWebWallet/Pages/ReceivePage.razor
@@ -1,6 +1,7 @@
 @page "/receive/{address}"
-@using Blazor.QrCodeGen
+@using ZXing;
 @using aoWebWallet.Models
+@using MudExtensions
 @inherits MvvmComponentBase<ReceiveViewModel>
 @inject GatewayUrlHelper UrlHelper;
 @inject IDialogService DialogService
@@ -43,7 +44,7 @@
         </MudStack>
 
         <MudText Typo="Typo.h4">Scan QR</MudText>
-        <QrCode CanvasId="@Address" Text="@BindingContext.QrCode" Options="_options" />
+         <MudBarcode Value="@BindingContext.QrCode" Width="200" Height="200" ForceHeight="1" BarcodeFormat="BarcodeFormat.QR_CODE" Clickable="false" />
     </MudStack>
     <br />
     @if (BindingContext.Token != null)
@@ -69,8 +70,6 @@
 
     public string detailUrl => $"/wallet/{Address}";
 
-    private QrCodeOptions _options = new QrCodeOptions() { ColorLight = System.Drawing.Color.White };
-
 
     protected override async Task OnParametersSetAsync()
     {

diff --git a/src/aoWebWallet/Program.cs b/src/aoWebWallet/Program.cs
@@ -15,8 +15,7 @@
 using aoww.Services.Models;
 using aoWebWallet.Models;
 using ArweaveAO.Models;
-using Blazor.QrCodeGen;
-using Microsoft.JSInterop;
+using MudExtensions.Services;
 
 namespace aoWebWallet
 {
@@ -91,9 +90,11 @@ private static void ConfigureServices(IServiceCollection services, string baseAd
             //Set Version
             Version = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
 
-            services.AddTransient(sp => new ModuleCreator(sp.GetRequiredService<IJSRuntime>()));
             services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(baseAddress) });
 
+            services.AddMudExtensions();
+
+
             //Services
             services.AddScoped<TokenDataService>();
             services.AddScoped<StorageService>();

diff --git a/src/aoWebWallet/ViewModels/ReceiveViewModel.cs b/src/aoWebWallet/ViewModels/ReceiveViewModel.cs
@@ -15,7 +15,7 @@ public string QrCode
         {
             get
             {
-                return $"{Address}";
+                //return $"{Address}";
 
                 if (string.IsNullOrEmpty(TokenId))
                     return $"ao:{Address}";

diff --git a/src/aoWebWallet/aoWebWallet.csproj b/src/aoWebWallet/aoWebWallet.csproj
@@ -14,8 +14,8 @@
 	<ItemGroup>
 		<PackageReference Include="ArweaveAO" Version="0.0.3" />
 		<PackageReference Include="ArweaveBlazor" Version="0.0.8" />
-		<PackageReference Include="Blazor.QrCodeGen" Version="1.1.3" />
 		<PackageReference Include="ClipLazor" Version="2.1.1" />
+		<PackageReference Include="CodeBeam.MudBlazor.Extensions" Version="6.9.2" />
 		<PackageReference Include="MudBlazor" Version="6.19.1" />
 		<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
 		<PackageReference Include="BlazorWasmPreRendering.Build" Version="4.0.0" />

diff --git a/src/aoWebWallet/wwwroot/index.html b/src/aoWebWallet/wwwroot/index.html
@@ -19,6 +19,7 @@
     <meta name="twitter:title" content="aoWebWallet. track your AO Arweave tokens" />
     <meta name="twitter:description" content="Manage your digital assets securely with the AO Web Wallet. Easily send, receive, and track your AO Arweave tokens holdings." />
     <meta name="twitter:image" content="https://aoww.net/images/social.jpg" />
+    <link href="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.css" rel="stylesheet" />
     <script type="text/javascript">
         // Single Page Apps for GitHub Pages
         // MIT License
@@ -110,8 +111,7 @@ <h4 style="color:white;opacity: 0.55; margin-top:20px;">loading...</h4>
     <script type="module">
         import { minidenticonSvg } from 'https://cdn.jsdelivr.net/npm/[email protected]/minidenticons.min.js'
     </script>
-    <script src="./_content/Blazor.QrCodeGen/qrcode.min.js"></script>
-    <script type="module" src="./_content/Blazor.QrCodeGen/qrcodeInterop.js"></script>
+    <script src="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
 </body>
 
 </html>