Merge pull request #2 from SriRadheshNagS/UpdateSample

saiganesh-sakthivel · web-flow · commit f32bcc5a7be2 · 2025-04-23T16:05:26.000+05:30
950873-Updated .NET Version for Dataform sample
diff --git a/CustomEditor/App.xaml.cs b/CustomEditor/App.xaml.cs
@@ -5,8 +5,11 @@ public partial class App : Application
         public App()
         {
             InitializeComponent();
+        }
 
-            MainPage = new AppShell();
+        protected override Window CreateWindow(IActivationState? activationState)
+        {
+            return new Window(new MainPage());
         }
     }
 }
diff --git a/CustomEditor/CustomDataEditor.cs b/CustomEditor/CustomDataEditor.cs
@@ -1,58 +1,55 @@
 ﻿using Syncfusion.Maui.DataForm;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CustomEditor
 {
     internal class CustomDataEditor : IDataFormEditor
     {
         private SfDataForm dataForm;
-        private DataFormCustomItem dataFormCustomItem;
+        private DataFormCustomItem? dataFormCustomItem;
 
         public CustomDataEditor(SfDataForm dataForm)
         {
             this.dataForm = dataForm;
         }
+
         public void CommitValue(DataFormItem dataFormItem, View view)
         {
-            dataFormItem.SetValue((view as Entry).Text);
+            dataFormItem.SetValue((view as Entry)?.Text);
         }
 
         public View CreateEditorView(DataFormItem dataFormItem)
         {
-            dataFormCustomItem = (DataFormCustomItem)dataFormItem;
-            if(dataFormItem.FieldName=="ProfileImage")
+            dataFormCustomItem = dataFormItem as DataFormCustomItem;
+
+            if (dataFormItem.FieldName == "ProfileImage")
             {
                 var view = new Image()
                 {
-                    Source=(dataFormItem.BindingContext as DataFormViewModel).ContactFormModel.ProfileImage,
-                    HorizontalOptions=LayoutOptions.Center,
-                    HeightRequest=80,
-                    WidthRequest=80
+                    Source = (dataFormItem.BindingContext as DataFormViewModel)?.ContactFormModel.ProfileImage,
+                    HorizontalOptions = LayoutOptions.Center,
+                    HeightRequest = 80,
+                    WidthRequest = 80
                 };
-
                 return view;
             }
-            else if(dataFormItem.FieldName=="Name")
+            else if (dataFormItem.FieldName == "Name")
             {
                 var entry = new Entry()
                 {
-                    HorizontalOptions=LayoutOptions.Start,
-                    VerticalOptions=LayoutOptions.Center
+                    HorizontalOptions = LayoutOptions.Start,
+                    VerticalOptions = LayoutOptions.Center
                 };
                 entry.TextChanged += Entry_TextChanged;
                 return entry;
             }
-            return null;
-            
+
+            return new Label { Text = "Unsupported Field" }; // Avoid returning null
         }
 
-        private void Entry_TextChanged(object sender, TextChangedEventArgs e)
+        private void Entry_TextChanged(object? sender, TextChangedEventArgs e)
         {
-            if(sender is InputView entry && dataFormCustomItem!=null)
+            if (sender is InputView entry && dataFormCustomItem is not null)
             {
                 this.CommitValue(dataFormCustomItem, entry);
             }
diff --git a/CustomEditor/CustomEditor.csproj b/CustomEditor/CustomEditor.csproj
@@ -1,15 +1,16 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>CustomEditor</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 
 		<!-- Display name -->
 		<ApplicationTitle>CustomEditor</ApplicationTitle>
@@ -58,9 +59,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-		<PackageReference Include="Syncfusion.Maui.DataForm" Version="23.1.40" />
-		<PackageReference Include="Syncfusion.Maui.Picker" Version="23.1.44" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="*" />
+		<PackageReference Include="Syncfusion.Maui.DataForm" Version="*" />
+		<PackageReference Include="Syncfusion.Maui.Picker" Version="*" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
 	</ItemGroup>
 
 </Project>
diff --git a/CustomEditor/CustomEditor.csproj.user b/CustomEditor/CustomEditor.csproj.user
diff --git a/CustomEditor/MainPage.xaml b/CustomEditor/MainPage.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:dataForm="clr-namespace:Syncfusion.Maui.DataForm;assembly=Syncfusion.Maui.DataForm"
              xmlns:local="clr-namespace:CustomEditor"
+             x:DataType="local:DataFormViewModel"
              x:Class="CustomEditor.MainPage">
 
     <Grid Background="White">

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,11 @@ public partial class App : Application`
`5`	`5`	`public App()`
`6`	`6`	`{`
`7`	`7`	`InitializeComponent();`
	`8`	`+ }`
`8`	`9`
`9`		`- MainPage = new AppShell();`
	`10`	`+ protected override Window CreateWindow(IActivationState? activationState)`
	`11`	`+ {`
	`12`	`+ return new Window(new MainPage());`
`10`	`13`	`}`
`11`	`14`	`}`
`12`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,58 +1,55 @@`
`1`	`1`	`using Syncfusion.Maui.DataForm;`
`2`	`2`	`using System;`
`3`		`-using System.Collections.Generic;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
`6`		`-using System.Threading.Tasks;`
`7`	`3`
`8`	`4`	`namespace CustomEditor`
`9`	`5`	`{`
`10`	`6`	`internal class CustomDataEditor : IDataFormEditor`
`11`	`7`	`{`
`12`	`8`	`private SfDataForm dataForm;`
`13`		`- private DataFormCustomItem dataFormCustomItem;`
	`9`	`+ private DataFormCustomItem? dataFormCustomItem;`
`14`	`10`
`15`	`11`	`public CustomDataEditor(SfDataForm dataForm)`
`16`	`12`	`{`
`17`	`13`	`this.dataForm = dataForm;`
`18`	`14`	`}`
	`15`	`+`
`19`	`16`	`public void CommitValue(DataFormItem dataFormItem, View view)`
`20`	`17`	`{`
`21`		`- dataFormItem.SetValue((view as Entry).Text);`
	`18`	`+ dataFormItem.SetValue((view as Entry)?.Text);`
`22`	`19`	`}`
`23`	`20`
`24`	`21`	`public View CreateEditorView(DataFormItem dataFormItem)`
`25`	`22`	`{`
`26`		`- dataFormCustomItem = (DataFormCustomItem)dataFormItem;`
`27`		`- if(dataFormItem.FieldName=="ProfileImage")`
	`23`	`+ dataFormCustomItem = dataFormItem as DataFormCustomItem;`
	`24`	`+`
	`25`	`+ if (dataFormItem.FieldName == "ProfileImage")`
`28`	`26`	`{`
`29`	`27`	`var view = new Image()`
`30`	`28`	`{`
`31`		`- Source=(dataFormItem.BindingContext as DataFormViewModel).ContactFormModel.ProfileImage,`
`32`		`- HorizontalOptions=LayoutOptions.Center,`
`33`		`- HeightRequest=80,`
`34`		`- WidthRequest=80`
	`29`	`+ Source = (dataFormItem.BindingContext as DataFormViewModel)?.ContactFormModel.ProfileImage,`
	`30`	`+ HorizontalOptions = LayoutOptions.Center,`
	`31`	`+ HeightRequest = 80,`
	`32`	`+ WidthRequest = 80`
`35`	`33`	`};`
`36`		`-`
`37`	`34`	`return view;`
`38`	`35`	`}`
`39`		`- else if(dataFormItem.FieldName=="Name")`
	`36`	`+ else if (dataFormItem.FieldName == "Name")`
`40`	`37`	`{`
`41`	`38`	`var entry = new Entry()`
`42`	`39`	`{`
`43`		`- HorizontalOptions=LayoutOptions.Start,`
`44`		`- VerticalOptions=LayoutOptions.Center`
	`40`	`+ HorizontalOptions = LayoutOptions.Start,`
	`41`	`+ VerticalOptions = LayoutOptions.Center`
`45`	`42`	`};`
`46`	`43`	`entry.TextChanged += Entry_TextChanged;`
`47`	`44`	`return entry;`
`48`	`45`	`}`
`49`		`- return null;`
`50`		`-`
	`46`	`+`
	`47`	`+ return new Label { Text = "Unsupported Field" }; // Avoid returning null`
`51`	`48`	`}`
`52`	`49`
`53`		`- private void Entry_TextChanged(object sender, TextChangedEventArgs e)`
	`50`	`+ private void Entry_TextChanged(object? sender, TextChangedEventArgs e)`
`54`	`51`	`{`
`55`		`- if(sender is InputView entry && dataFormCustomItem!=null)`
	`52`	`+ if (sender is InputView entry && dataFormCustomItem is not null)`
`56`	`53`	`{`
`57`	`54`	`this.CommitValue(dataFormCustomItem, entry);`
`58`	`55`	`}`