From d53775bba5872c0b456a4736fffedae26982ca31 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Wed, 7 Dec 2022 21:14:42 +0100 Subject: [PATCH 1/5] Update NuGet && Fixed MachinePage Padding --- .../Borepin.Android/Borepin.Android.csproj | 2 +- .../Resources/Resource.designer.cs | 2 +- Borepin/Borepin.GTK/Borepin.GTK.csproj | 24 +++++++++---------- Borepin/Borepin.GTK/app.config | 2 +- Borepin/Borepin.GTK/packages.config | 6 ++--- Borepin/Borepin.UWP/Borepin.UWP.csproj | 4 ++-- Borepin/Borepin.iOS/Borepin.iOS.csproj | 2 +- Borepin/Borepin.macOS/Borepin.macOS.csproj | 22 ++++++++--------- Borepin/Borepin.macOS/app.config | 2 +- Borepin/Borepin.macOS/packages.config | 4 ++-- Borepin/Borepin/Borepin.csproj | 8 +++---- Borepin/Borepin/Page/MachinePage.xaml | 4 ++-- Borepin_Test/Borepin_Test.csproj | 2 +- FabAccessAPI/FabAccessAPI.csproj | 2 +- FabAccessAPI_Test/FabAccessAPI_Test.csproj | 2 +- 15 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj index efce28d..9b97e58 100644 --- a/Borepin/Borepin.Android/Borepin.Android.csproj +++ b/Borepin/Borepin.Android/Borepin.Android.csproj @@ -67,7 +67,7 @@ 8.1.97 - + diff --git a/Borepin/Borepin.Android/Resources/Resource.designer.cs b/Borepin/Borepin.Android/Resources/Resource.designer.cs index 0f414b2..8a95f39 100644 --- a/Borepin/Borepin.Android/Resources/Resource.designer.cs +++ b/Borepin/Borepin.Android/Resources/Resource.designer.cs @@ -14,7 +14,7 @@ namespace Borepin.Droid { - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.1.0.5")] public partial class Resource { diff --git a/Borepin/Borepin.GTK/Borepin.GTK.csproj b/Borepin/Borepin.GTK/Borepin.GTK.csproj index 18d5a31..825c18f 100644 --- a/Borepin/Borepin.GTK/Borepin.GTK.csproj +++ b/Borepin/Borepin.GTK/Borepin.GTK.csproj @@ -1,6 +1,6 @@  - + Debug @@ -42,8 +42,8 @@ False ..\..\..\..\..\..\..\Program Files (x86)\GtkSharp\2.12\lib\gtk-sharp-2.0\atk-sharp.dll - - ..\..\packages\DryIoc.dll.5.2.2\lib\net45\DryIoc.dll + + ..\..\packages\DryIoc.dll.5.3.1\lib\net45\DryIoc.dll False @@ -93,19 +93,19 @@ - ..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2515\lib\net45\webkit-sharp.dll + ..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2545\lib\net45\webkit-sharp.dll - ..\..\packages\Xamarin.Forms.5.0.0.2515\lib\netstandard2.0\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.5.0.0.2545\lib\netstandard2.0\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.5.0.0.2515\lib\netstandard2.0\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.5.0.0.2545\lib\netstandard2.0\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2515\lib\net45\Xamarin.Forms.Platform.GTK.dll + ..\..\packages\Xamarin.Forms.Platform.GTK.5.0.0.2545\lib\net45\Xamarin.Forms.Platform.GTK.dll - ..\..\packages\Xamarin.Forms.5.0.0.2515\lib\netstandard2.0\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.5.0.0.2545\lib\netstandard2.0\Xamarin.Forms.Xaml.dll @@ -132,10 +132,10 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - + + - + \ No newline at end of file diff --git a/Borepin/Borepin.GTK/app.config b/Borepin/Borepin.GTK/app.config index 2ba991a..94e68b3 100644 --- a/Borepin/Borepin.GTK/app.config +++ b/Borepin/Borepin.GTK/app.config @@ -12,7 +12,7 @@ - + diff --git a/Borepin/Borepin.GTK/packages.config b/Borepin/Borepin.GTK/packages.config index b93bbf5..24e7fe9 100644 --- a/Borepin/Borepin.GTK/packages.config +++ b/Borepin/Borepin.GTK/packages.config @@ -1,11 +1,11 @@  - + - - + + \ No newline at end of file diff --git a/Borepin/Borepin.UWP/Borepin.UWP.csproj b/Borepin/Borepin.UWP/Borepin.UWP.csproj index 2e704b5..aa6495f 100644 --- a/Borepin/Borepin.UWP/Borepin.UWP.csproj +++ b/Borepin/Borepin.UWP/Borepin.UWP.csproj @@ -11,7 +11,7 @@ Borepin.UWP en-US UAP - 10.0.19041.0 + 10.0.17763.0 10.0.16299.0 14 true @@ -181,7 +181,7 @@ 8.1.97 - + diff --git a/Borepin/Borepin.iOS/Borepin.iOS.csproj b/Borepin/Borepin.iOS/Borepin.iOS.csproj index fd6d3ed..ba7a226 100644 --- a/Borepin/Borepin.iOS/Borepin.iOS.csproj +++ b/Borepin/Borepin.iOS/Borepin.iOS.csproj @@ -189,7 +189,7 @@ - 5.0.0.2515 + 5.0.0.2545 diff --git a/Borepin/Borepin.macOS/Borepin.macOS.csproj b/Borepin/Borepin.macOS/Borepin.macOS.csproj index f96e287..dee928e 100644 --- a/Borepin/Borepin.macOS/Borepin.macOS.csproj +++ b/Borepin/Borepin.macOS/Borepin.macOS.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -59,8 +59,8 @@ - - ..\..\packages\DryIoc.dll.5.2.2\lib\netstandard2.1\DryIoc.dll + + ..\..\packages\DryIoc.dll.5.3.1\lib\netstandard2.1\DryIoc.dll ..\..\packages\Prism.Core.8.1.97\lib\netstandard2.0\Prism.dll @@ -74,16 +74,16 @@ - ..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Core.dll + ..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Core.dll - ..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll + ..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll - ..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll + ..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll - ..\..\packages\Xamarin.Forms.5.0.0.2515\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll + ..\..\packages\Xamarin.Forms.5.0.0.2545\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll @@ -131,10 +131,10 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - - + + - + \ No newline at end of file diff --git a/Borepin/Borepin.macOS/app.config b/Borepin/Borepin.macOS/app.config index 4cbf8ed..46d5e88 100644 --- a/Borepin/Borepin.macOS/app.config +++ b/Borepin/Borepin.macOS/app.config @@ -8,7 +8,7 @@ - + diff --git a/Borepin/Borepin.macOS/packages.config b/Borepin/Borepin.macOS/packages.config index df38786..86d3893 100644 --- a/Borepin/Borepin.macOS/packages.config +++ b/Borepin/Borepin.macOS/packages.config @@ -1,9 +1,9 @@  - + - + \ No newline at end of file diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj index 1610386..a5f7eac 100644 --- a/Borepin/Borepin/Borepin.csproj +++ b/Borepin/Borepin/Borepin.csproj @@ -31,15 +31,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml index 259b9a0..5a0cfaf 100644 --- a/Borepin/Borepin/Page/MachinePage.xaml +++ b/Borepin/Borepin/Page/MachinePage.xaml @@ -17,8 +17,8 @@ - - + + diff --git a/Borepin_Test/Borepin_Test.csproj b/Borepin_Test/Borepin_Test.csproj index c572005..ac9636d 100644 --- a/Borepin_Test/Borepin_Test.csproj +++ b/Borepin_Test/Borepin_Test.csproj @@ -8,7 +8,7 @@ - + diff --git a/FabAccessAPI/FabAccessAPI.csproj b/FabAccessAPI/FabAccessAPI.csproj index c6d2500..bc2a806 100644 --- a/FabAccessAPI/FabAccessAPI.csproj +++ b/FabAccessAPI/FabAccessAPI.csproj @@ -13,7 +13,7 @@ - + diff --git a/FabAccessAPI_Test/FabAccessAPI_Test.csproj b/FabAccessAPI_Test/FabAccessAPI_Test.csproj index b863a6e..2dc8931 100644 --- a/FabAccessAPI_Test/FabAccessAPI_Test.csproj +++ b/FabAccessAPI_Test/FabAccessAPI_Test.csproj @@ -9,7 +9,7 @@ - + From e1c9078036110dbb56fbd7390110e9039ace14d5 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Thu, 8 Dec 2022 01:26:49 +0100 Subject: [PATCH 2/5] Added User Searchbar --- Borepin/Borepin/Page/MachinePage.xaml | 46 ++-- Borepin/Borepin/Page/UserListPage.xaml | 9 +- .../Borepin/PageModel/MachineListPageModel.cs | 6 +- Borepin/Borepin/PageModel/StartPageModel.cs | 21 +- .../Borepin/PageModel/UserListPageModel.cs | 29 +++ .../Resources/Text/TextResource.Designer.cs | 228 ++++++++++-------- .../Borepin/Resources/Text/TextResource.resx | 6 + 7 files changed, 212 insertions(+), 133 deletions(-) diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml index 5a0cfaf..3a0576f 100644 --- a/Borepin/Borepin/Page/MachinePage.xaml +++ b/Borepin/Borepin/Page/MachinePage.xaml @@ -19,33 +19,35 @@ - + + - -