From a3be387ee1d9618e659a53d7c6f39412b8299fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Szab=C3=B3?= <ivan.szabo.sis@gmail.com>
Date: Mon, 7 Apr 2025 08:24:04 +0200
Subject: [PATCH] =?UTF-8?q?M=C3=A9g=20egy=20kis=20UI=20rendez=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseStock/CheckPoints/CheckPointEditPage.xaml  |  7 ++++---
 .../BaseStock/CheckPoints/CheckPointsPage.xaml     |  1 +
 .../BaseStock/CheckPoints/CheckPointsPage.xaml.cs  |  1 +
 .../Pages/CheckList/CheckListPage.xaml             |  7 +++++++
 .../Pages/CheckList/CheckListPage.xaml.cs          |  6 ++++++
 src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml  |  4 +++-
 .../Pages/NFC/NFCTestPage.xaml.cs                  |  3 ++-
 .../Platforms/Android/MainActivity.cs              | 14 +++++++++++++-
 8 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointEditPage.xaml b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointEditPage.xaml
index fdb2368..5253d7b 100644
--- a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointEditPage.xaml
+++ b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointEditPage.xaml
@@ -4,6 +4,7 @@
              x:Class="WorkFlowCheck.MAUI.Pages.BaseStock.CheckPoints.CheckPointEditPage"
              xmlns:local="clr-namespace:WorkFlowCheck.MAUI.Pages.BaseStock.CheckPoints"
              xmlns:templateselectors="clr-namespace:WorkFlowCheck.MAUI.TemplateSelectors"
+             BackgroundColor="#f0f0f0"
              Title="{Binding CheckPointDTO.ShortName}">
     <StackLayout Padding="20">
         <!-- Cím: Edit Item -->
@@ -25,13 +26,13 @@
                 <ColumnDefinition Width="200" />
             </Grid.ColumnDefinitions>
 
-            <Button Text="Save" Command="{Binding SaveCommand}" Grid.Column="0"/>
-            <Button Text="Cancel" Command="{Binding CancelCommand}" Grid.Column="2"/>
+            <!--<Button Text="Save" Command="{Binding SaveCommand}" Grid.Column="0"/>
+            <Button Text="Cancel" Command="{Binding CancelCommand}" Grid.Column="2"/>-->
         </Grid>
         <Label Text="Ellenőrzési feladatok" FontAttributes="Bold" FontSize="Medium" HorizontalOptions="Center" />
         <Frame BorderColor="Gray" Padding="1" Margin="2" HasShadow="True" CornerRadius="2">
             <CollectionView x:Name="CheckPointCheckListRows" 
-                            HeightRequest="440"
+                            HeightRequest="490"
                             
                             ItemTemplate="{StaticResource AnswerTemplateSelector}">
                 <CollectionView.EmptyView>
diff --git a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml
index 68c908c..e42b8a9 100644
--- a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml
+++ b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml
@@ -2,6 +2,7 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="WorkFlowCheck.MAUI.Pages.BaseStock.CheckPointsPage"
+             BackgroundColor="#f0f0f0"
              Title="Ellenőrzési pontok">
     <Grid>
         <!-- Fő tartalom -->
diff --git a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml.cs
index c258e9c..10fccbc 100644
--- a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml.cs
@@ -5,6 +5,7 @@ using WorkFlowCheck.MAUI.Pages.BaseStock.CheckPoints;
 using WorkFlowCheck.MAUI.Services.Interfaces;
 using Plugin.NFC;
 using WorkFlowCheck.MAUI.Pages.NFC;
+using AndroidX.Camera.Core.Impl;
 
 namespace WorkFlowCheck.MAUI.Pages.BaseStock;
 
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml
index fc835d6..5eb8c4f 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml
@@ -28,6 +28,13 @@
 
                                         <!-- Jobb oldali oszlop: Két gomb egymás mellett -->
                                         <HorizontalStackLayout Grid.Column="1" HorizontalOptions="End" Spacing="5">
+                                            <Button Text="Blokkolás"
+                                                Margin="5,0,0,0"
+                                                BackgroundColor="Red"
+                                                IsVisible="{Binding CheckStatus, Converter={StaticResource BlockedHideConverter}}"
+                                                Command="{Binding BindingContext.BlockCommand, Source={x:Reference CheckList}}" 
+                                                CommandParameter="{Binding .}">
+                                            </Button>
                                             <Button Text="Feloldás"
                                                 Margin="5,0,0,0"
                                                 BackgroundColor="Green"
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
index e229f38..1048b9d 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListPage.xaml.cs
@@ -19,6 +19,7 @@ public partial class CheckListPage : ContentPage
     public ICommand NewCommand { get; set; }
     public ICommand ContinueCommand { get; set; }
     public ICommand UnblockCommand { get; set; }
+    public ICommand BlockCommand { get; set; }
     public bool IsLoading
     {
         get => _isLoading;
@@ -38,6 +39,7 @@ public partial class CheckListPage : ContentPage
         NewCommand = new Command<CheckListTemplateHeaderDTO>(OnNewItem);
         ContinueCommand = new Command<CheckListHeaderDTO>(OnContinueItem);
         UnblockCommand = new Command<CheckListHeaderDTO>(OnUnblockItem);
+        BlockCommand = new Command<CheckListHeaderDTO>(OnBlockItem);
 
     }
     protected override bool OnBackButtonPressed()
@@ -80,6 +82,10 @@ public partial class CheckListPage : ContentPage
     private async void OnUnblockItem(CheckListHeaderDTO checkListHeaderDTO)
     {
 
+    }
+    private async void OnBlockItem(CheckListHeaderDTO checkListHeaderDTO)
+    {
+
     }
     private async Task LoadCheckListTemplate()
     {
diff --git a/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml b/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml
index 50058b8..75f6ae1 100644
--- a/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml
+++ b/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml
@@ -2,7 +2,9 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="WorkFlowCheck.MAUI.Pages.NFC.NFCTestPage"
-             Title="NFCTestPage">
+             BackgroundColor="#f0f0f0"
+             Title="NFC teszt ">
+    
     <RefreshView x:Name="refreshView" Command="{Binding RefreshCommand}" IsRefreshing="{Binding IsRefreshing}">
         <CollectionView x:Name="NFCDataListCollection" ItemsSource="{Binding NFCDataList}">
             <CollectionView.ItemTemplate>
diff --git a/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs
index e45142e..9be56cf 100644
--- a/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/NFC/NFCTestPage.xaml.cs
@@ -134,7 +134,7 @@ public partial class NFCTestPage : ContentPage
 
         // Customized serial number
         var identifier = tagInfo.Identifier;
-        var serialNumber = NFCUtils.ByteArrayToHexString(identifier, ":");
+        var serialNumber = NFCUtils.ByteArrayToHexString(identifier, "");
 
         if (NFCDataList == null)
         {
@@ -158,6 +158,7 @@ public partial class NFCTestPage : ContentPage
         IsRefreshing = false;
         OnPropertyChanged(nameof(IsRefreshing));
         OnPropertyChanged(nameof(NFCDataList));
+        
     }
     string GetMessage(NFCNdefRecord record)
     {
diff --git a/src/WorkFlowCheck.MAUI/Platforms/Android/MainActivity.cs b/src/WorkFlowCheck.MAUI/Platforms/Android/MainActivity.cs
index 7d93a3d..30b3b82 100644
--- a/src/WorkFlowCheck.MAUI/Platforms/Android/MainActivity.cs
+++ b/src/WorkFlowCheck.MAUI/Platforms/Android/MainActivity.cs
@@ -3,6 +3,7 @@ using Android.Content;
 using Android.Content.PM;
 using Android.Nfc;
 using Android.OS;
+using Plugin.NFC;
 
 
 namespace WorkFlowCheck.MAUI
@@ -32,6 +33,7 @@ namespace WorkFlowCheck.MAUI
         
         protected override void OnCreate(Bundle savedInstanceState)
         {
+            CrossNFC.Init(this);
             base.OnCreate(savedInstanceState);
             nfcAdapter = NfcAdapter.GetDefaultAdapter(this);
             pendingIntent = PendingIntent.GetActivity(this, 0,
@@ -43,7 +45,9 @@ namespace WorkFlowCheck.MAUI
         protected override void OnNewIntent(Intent intent)
         {
             base.OnNewIntent(intent);
-
+            
+            CrossNFC.OnNewIntent(intent);
+            
             if (intent.Action == NfcAdapter.ActionTagDiscovered)
             {
                 var tag = intent.GetParcelableExtra(NfcAdapter.ExtraTag) as Tag;
@@ -55,7 +59,15 @@ namespace WorkFlowCheck.MAUI
                 }
             }
         }
+        
+        protected override void OnResume()
+        {
+            base.OnResume();
 
+            // Plugin NFC: Restart NFC listening on resume (needed for Android 10+) 
+            CrossNFC.OnResume();
+        }
+        
         public void StartNfc(Action<string> onTagRead)
         {
             _onTagRead = onTagRead;