Skip to content

Commit b9a12af

Browse files
committed
UPDATE: delete obsolete code from scanner -> Pl.Tablet.Client
1 parent 0ea569e commit b9a12af

File tree

8 files changed

+51
-48
lines changed

8 files changed

+51
-48
lines changed

.github/workflows/ci.yml

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
name: CI
2-
3-
on:
4-
push:
5-
branches:
6-
- main
7-
- develop
8-
paths:
9-
- '**.cs'
10-
- '**.csproj'
11-
12-
jobs:
13-
build:
14-
runs-on: windows-latest
15-
16-
steps:
17-
- name: Checkout to the repository
18-
uses: actions/checkout@v4
19-
20-
- name: Setup NodeJS
21-
uses: actions/setup-node@v4
22-
with:
23-
node-version: 20
24-
25-
- name: Setup .NET
26-
uses: actions/setup-dotnet@v4
27-
with:
28-
dotnet-version: 8.x
29-
30-
- name: Install dependencies
31-
run: dotnet restore
32-
33-
- name: Run tests
34-
run: |
35-
dotnet test Src/Tests/Ws.Components.Tests/Ws.Components.Tests.csproj --no-restore --verbosity quiet --configuration ReleaseVS
36-
dotnet test Src/Tests/Ws.Architecture.Tests/Ws.Architecture.Tests.csproj --no-restore --verbosity quiet --configuration ReleaseVS
37-
dotnet test Src/Tests/Ws.Print.Tests/Ws.Print.Tests.csproj --no-restore --verbosity quiet --configuration ReleaseVS
1+
#name: CI
2+
#
3+
#on:
4+
# push:
5+
# branches:
6+
# - main
7+
# - develop
8+
# paths:
9+
# - '**.cs'
10+
# - '**.csproj'
11+
#
12+
#jobs:
13+
# build:
14+
# runs-on: windows-latest
15+
#
16+
# steps:
17+
# - name: Checkout to the repository
18+
# uses: actions/checkout@v4
19+
#
20+
# - name: Setup NodeJS
21+
# uses: actions/setup-node@v4
22+
# with:
23+
# node-version: 20
24+
#
25+
# - name: Setup .NET
26+
# uses: actions/setup-dotnet@v4
27+
# with:
28+
# dotnet-version: 8.x
29+
#
30+
# - name: Install dependencies
31+
# run: dotnet restore
32+
#
33+
# - name: Run tests
34+
# run: |
35+
# dotnet test Src/Tests/Ws.Components.Tests/Ws.Components.Tests.csproj --no-restore --verbosity quiet --configuration ReleaseVS
36+
# dotnet test Src/Tests/Ws.Architecture.Tests/Ws.Architecture.Tests.csproj --no-restore --verbosity quiet --configuration ReleaseVS
37+
# dotnet test Src/Tests/Ws.Print.Tests/Ws.Print.Tests.csproj --no-restore --verbosity quiet --configuration ReleaseVS

Src/Apps/Tablet/Pl.Tablet.Client/Pl.Tablet.Client.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<PropertyGroup Label="Primary">
99
<TargetFramework>net9.0-android</TargetFramework>
10-
10+
<AcceptAndroidSDKLicenses>true</AcceptAndroidSDKLicenses>
1111
<OutputType>Exe</OutputType>
1212
<UseMaui>true</UseMaui>
1313
<SingleProject>true</SingleProject>

Src/Apps/Tablet/Pl.Tablet.Client/Platforms/Android/DocumentService.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Android.Content;
22
using Android.Print;
33
using Pl.Tablet.Client;
4-
using Pl.Tablet.Client.Source.Shared;
54
using Pl.Tablet.Client.Source.Shared.Services;
65
using WebView = Android.Webkit.WebView;
76

Src/Apps/Tablet/Pl.Tablet.Client/Platforms/Android/MainApplication.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
namespace Pl.Tablet.Client;
55

66
[Application]
7-
public class MainApplication : MauiApplication
7+
public class MainApplication(IntPtr handle, JniHandleOwnership ownership) : MauiApplication(handle, ownership)
88
{
9-
public MainApplication(IntPtr handle, JniHandleOwnership ownership) : base(handle, ownership) {}
10-
119
protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
1210
}

Src/Apps/Tablet/Pl.Tablet.Client/Source/Features/CameraBarcodeScanner.razor

+3-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040

4141
private async Task OpenCameraScanner()
4242
{
43-
if (Application.Current?.MainPage == null) return;
44-
await Application.Current.MainPage.Navigation.PushModalAsync(ScanPage.Value);
43+
if (Application.Current?.Windows.FirstOrDefault()?.Page is not { } currentPage)
44+
return;
45+
await currentPage.Navigation.PushModalAsync(ScanPage.Value);
4546
}
4647

4748
private async Task OpenCameraScannerWithCooldown()

Src/Apps/Tablet/Pl.Tablet.Client/Source/Pages/Create/ViewPalletDialog.razor

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@using Pl.Tablet.Models.Features.Pallets.Output
22
@using Blazor.Heroicons.Outline
33
@using Button = Pl.Components.Source.UI.Button
4+
@using Pl.Tablet.Client.Source.Pages.Create.CreatePalletDialog
45

56
@implements IDialogContentComponent<PalletDto>
67

Src/Libs/Pl.Components/Shared/_Imports.razor

+5-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@* Microsoft *@
66
@using Microsoft.JSInterop
77
@using Microsoft.AspNetCore.Authorization
8+
@using Microsoft.AspNetCore.Components
89
@using Microsoft.AspNetCore.Components.Web
910
@using Microsoft.AspNetCore.Components.Forms
1011
@using Microsoft.AspNetCore.Components.Routing
@@ -25,7 +26,6 @@
2526
@using Pl.Components.Source.UI.Badge
2627
@using Pl.Components.Source.UI.Dropdown
2728
@using Pl.Components.Source.Utils
28-
@using TailwindMerge;
2929

3030
@* Pl.Shared *@
3131
@using Pl.Shared.Enums;
@@ -35,4 +35,7 @@
3535
@* BF.Utilities *@
3636
@using BF.Utilities.Utils;
3737
@using BF.Utilities.Extensions;
38-
@using BF.Utilities.ValueTypes;
38+
@using BF.Utilities.ValueTypes;
39+
40+
@* Other *@
41+
@using TailwindMerge;
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
@using Pl.Components.Source.Utils
1+
@using Microsoft.AspNetCore.Components;
2+
@using Microsoft.FluentUI.AspNetCore.Components
23
@using TailwindMerge
3-
@using Microsoft.FluentUI.AspNetCore.Components
4+
@using Pl.Components.Source.Utils

0 commit comments

Comments
 (0)