From 0ec74974629a3c7f028aa2961d560600dc8c7830 Mon Sep 17 00:00:00 2001 From: alexander Date: Mon, 4 Nov 2024 14:30:17 +0200 Subject: [PATCH] feat: change EmailsInputControl References: Eppie-io/Eppie-App#382 --- .../Eppie.App.UI.Shared.projitems | 8 +- .../Controls/EmailsInputControl.xaml | 79 +++++++++++++++++++ .../Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj | 4 + .../Controls/EmailsInputControl.xaml | 25 +----- 4 files changed, 87 insertions(+), 29 deletions(-) create mode 100644 source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Controls/EmailsInputControl.xaml rename source/Eppie.App/Eppie.App.UI/{Eppie.App.UI.Shared => Eppie.App.UI.Uno}/Controls/EmailsInputControl.xaml (68%) diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems index ba66aacf..b20e4def 100644 --- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Eppie.App.UI.Shared.projitems @@ -35,9 +35,7 @@ EmailProvidersListControl.xaml - - EmailsInputControl.xaml - + ErrorControl.xaml @@ -99,10 +97,6 @@ Designer MSBuild:Compile - - Designer - MSBuild:Compile - Designer MSBuild:Compile diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Controls/EmailsInputControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Controls/EmailsInputControl.xaml new file mode 100644 index 00000000..43c78786 --- /dev/null +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Controls/EmailsInputControl.xaml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj index 2f0a81d5..cf6d8d68 100644 --- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.UWP/Eppie.App.UI.UWP.csproj @@ -126,6 +126,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailsInputControl.xaml b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Controls/EmailsInputControl.xaml similarity index 68% rename from source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailsInputControl.xaml rename to source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Controls/EmailsInputControl.xaml index 26d609f8..fbf5e3db 100644 --- a/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Shared/Controls/EmailsInputControl.xaml +++ b/source/Eppie.App/Eppie.App.UI/Eppie.App.UI.Uno/Controls/EmailsInputControl.xaml @@ -3,13 +3,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:not_win="http://uno.ui/not_win" - xmlns:uwp_toolkit_controls="http://uno.ui/uwp#using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:viewmodels="using:Tuvi.App.ViewModels" - xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation" d:DesignHeight="300" d:DesignWidth="400" - mc:Ignorable="d not_win uwp_toolkit_controls"> + mc:Ignorable="d"> @@ -70,27 +67,11 @@ - - - - - + - - - +