From e306139aec2f733e405221d4c97a6e415bd1a587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Szab=C3=B3?= Date: Mon, 7 Apr 2025 07:57:10 +0200 Subject: [PATCH] =?UTF-8?q?Egy=20kis=20UI=20rendez=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WorkFlowCheck.MAUI/MainPage.xaml.cs | 2 +- src/WorkFlowCheck.MAUI/MauiProgram.cs | 3 +- .../CheckPoints/CheckPointsPage.xaml | 8 ++- .../Pages/CheckList/CheckListPage.xaml | 66 ++++++++++++------ .../Pages/CheckList/CheckListPage.xaml.cs | 49 ++++++++++++- .../Pages/Security/LoginPage.xaml.cs | 1 + .../Platforms/Android/MainActivity.cs | 11 ++- .../Android/Resources/mipmap-hdpi/appicon.png | Bin 0 -> 2376 bytes .../Android/Resources/mipmap-mdpi/appicon.png | Bin 0 -> 1506 bytes .../Resources/mipmap-xhdpi/appicon.png | Bin 0 -> 3214 bytes .../Resources/mipmap-xxhdpi/appicon.png | Bin 0 -> 4822 bytes .../Resources/mipmap-xxxhdpi/appicon.png | Bin 0 -> 6203 bytes .../Resources/AppIcon/appicon.svg | 7 +- .../Resources/AppIcon/appiconfg.svg | 14 ++-- .../Services/BaseService.cs | 1 + .../Services/Interfaces/IUserService.cs | 1 + .../Services/SyncService.cs | 16 ++--- .../Services/UserService.cs | 1 + .../WorkFlowCheck.MAUI.csproj | 7 ++ 19 files changed, 137 insertions(+), 50 deletions(-) create mode 100644 src/WorkFlowCheck.MAUI/Platforms/Android/Resources/mipmap-hdpi/appicon.png create mode 100644 src/WorkFlowCheck.MAUI/Platforms/Android/Resources/mipmap-mdpi/appicon.png create mode 100644 src/WorkFlowCheck.MAUI/Platforms/Android/Resources/mipmap-xhdpi/appicon.png create mode 100644 src/WorkFlowCheck.MAUI/Platforms/Android/Resources/mipmap-xxhdpi/appicon.png create mode 100644 src/WorkFlowCheck.MAUI/Platforms/Android/Resources/mipmap-xxxhdpi/appicon.png diff --git a/src/WorkFlowCheck.MAUI/MainPage.xaml.cs b/src/WorkFlowCheck.MAUI/MainPage.xaml.cs index 6674dd4..e703887 100644 --- a/src/WorkFlowCheck.MAUI/MainPage.xaml.cs +++ b/src/WorkFlowCheck.MAUI/MainPage.xaml.cs @@ -18,7 +18,7 @@ namespace WorkFlowCheck.MAUI { base.OnAppearing(); var currentUser = _userService.GetCurrentUser(); - DeviceId.Text = DeviceInfo.Current.Idiom.ToString(); + DeviceId.Text = _userService.DeviceId; if (currentUser != null) { foreach (var role in currentUser.RoleDTO) diff --git a/src/WorkFlowCheck.MAUI/MauiProgram.cs b/src/WorkFlowCheck.MAUI/MauiProgram.cs index 07987bc..079da77 100644 --- a/src/WorkFlowCheck.MAUI/MauiProgram.cs +++ b/src/WorkFlowCheck.MAUI/MauiProgram.cs @@ -49,7 +49,8 @@ namespace WorkFlowCheck.MAUI builder.Services.AddTransient(); - builder.UseMauiApp() + builder + .UseMauiApp() .UseDevExpressEditors() .UseMauiCommunityToolkitCamera() .ConfigureFonts(fonts => diff --git a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml index b5a5516..68c908c 100644 --- a/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml +++ b/src/WorkFlowCheck.MAUI/Pages/BaseStock/CheckPoints/CheckPointsPage.xaml @@ -19,18 +19,20 @@ + - + - + @@ -36,8 +51,8 @@ - - - -