Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgraded to the last version of the XF & Ess + bugs in the csproj fixed #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

upgraded to the last version of the XF & Ess + bugs in the csproj fixed #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions DynamicDataGroupingSample.Android/DynamicDataGroupingSample.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand All @@ -16,7 +16,7 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
Expand All @@ -32,6 +32,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode>
<AndroidDexTool>d8</AndroidDexTool>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -53,8 +54,8 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1451" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1931" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down Expand Up @@ -93,5 +94,10 @@
<Name>DynamicDataGroupingSample</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<ProjectExtensions>
<VisualStudio>
<UserProperties TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
</Project>
2 changes: 1 addition & 1 deletion DynamicDataGroupingSample.Android/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.crossgeeks.dynamicdatagroupingsample">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<application android:label="DynamicDataGroupingSample.Android" android:theme="@style/MainTheme"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest>
11,430 changes: 7,972 additions & 3,458 deletions DynamicDataGroupingSample.Android/Resources/Resource.designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions DynamicDataGroupingSample.iOS/DynamicDataGroupingSample.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1451" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1931" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
Expand All @@ -133,4 +133,9 @@
<Name>DynamicDataGroupingSample</Name>
</ProjectReference>
</ItemGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties TriggeredFromHotReload="False" />
</VisualStudio>
</ProjectExtensions>
</Project>
45 changes: 23 additions & 22 deletions DynamicDataGroupingSample.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,54 +7,55 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicDataGroupingSample.A
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicDataGroupingSample.iOS", "DynamicDataGroupingSample.iOS\DynamicDataGroupingSample.iOS.csproj", "{89CF714C-2D19-4EA0-8619-5418A8503FE8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicDataGroupingSample", "DynamicDataGroupingSample\DynamicDataGroupingSample.csproj", "{B6081D74-BD05-481F-BF11-EEBD5B089FFC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicDataGroupingSample", "DynamicDataGroupingSample\DynamicDataGroupingSample.csproj", "{B6081D74-BD05-481F-BF11-EEBD5B089FFC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Release|iPhoneSimulator = Release|iPhoneSimulator
Debug|iPhone = Debug|iPhone
Debug|iPhoneSimulator = Debug|iPhoneSimulator
Release|Any CPU = Release|Any CPU
Release|iPhone = Release|iPhone
Release|iPhoneSimulator = Release|iPhoneSimulator
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|Any CPU.Build.0 = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|iPhone.Build.0 = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|Any CPU.Build.0 = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|iPhone.ActiveCfg = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|iPhone.Build.0 = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{623E79F7-00C4-4CF4-9130-C6384B6C02EB}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|iPhone.ActiveCfg = Debug|iPhone
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|iPhone.Build.0 = Debug|iPhone
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|iPhone.ActiveCfg = Release|iPhone
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|iPhone.Build.0 = Release|iPhone
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{89CF714C-2D19-4EA0-8619-5418A8503FE8}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|Any CPU.Build.0 = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|iPhone.Build.0 = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|Any CPU.Build.0 = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|iPhone.ActiveCfg = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|iPhone.Build.0 = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B6081D74-BD05-481F-BF11-EEBD5B089FFC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
12 changes: 2 additions & 10 deletions DynamicDataGroupingSample/DynamicDataGroupingSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1451" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1931" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="DynamicData" Version="7.1.1" />
</ItemGroup>
<ItemGroup>
<Folder Include="Models\" />
<Folder Include="ViewModels\" />
<Folder Include="Views\" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Views\MainPage.xaml.cs" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions DynamicDataGroupingSample/ViewModels/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public MainViewModel()
.DisposeMany()
.Subscribe();

AddCommand = new Command(async() => await ExecuteAdd());
AddCommand = new Command(async () => await ExecuteAdd());
DeleteCommand = new Command<Restaurant>(ExecuteRemove);
}

Expand All @@ -47,7 +47,7 @@ private void ExecuteRemove(Restaurant restaurant)
{
update.Remove(restaurant);
});
}
}

private async Task ExecuteAdd()
{
Expand Down
41 changes: 21 additions & 20 deletions DynamicDataGroupingSample/Views/MainPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
<?xml version="1.0" encoding="utf-8" ?>
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="DynamicDataGroupingSample.MainPage"
xmlns:local="clr-namespace:DynamicDataGroupingSample"
xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
Title="My Restaurants"
ios:Page.UseSafeArea="true">
<ContentPage
x:Class="DynamicDataGroupingSample.MainPage"
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
xmlns:local="clr-namespace:DynamicDataGroupingSample"
Title="My Restaurants"
ios:Page.UseSafeArea="true"
x:DataType="local:MainViewModel">
<ContentPage.BindingContext>
<local:MainViewModel/>
<local:MainViewModel />
</ContentPage.BindingContext>
<ContentPage.ToolbarItems>
<ToolbarItem Text="Add" Command="{Binding AddCommand,Mode=OneTime}"/>
<ContentPage.ToolbarItems>
<ToolbarItem Command="{Binding AddCommand, Mode=OneTime}" Text="Add" />
</ContentPage.ToolbarItems>
<ListView x:Name="RestaurantsList"
ItemsSource="{Binding Restaurants}">
<ListView x:Name="RestaurantsList" ItemsSource="{Binding Restaurants}">
<ListView.ItemTemplate>
<DataTemplate x:DataType="local:Restaurant">
<TextCell Text="{Binding Name}"
Detail="{Binding Type}" >

<TextCell Detail="{Binding Type}" Text="{Binding Name}">

<TextCell.ContextActions>
<MenuItem Text="Delete"
IsDestructive="True"
Command="{Binding BindingContext.DeleteCommand, Mode=OneTime, Source={x:Reference RestaurantsList}}"
CommandParameter="{Binding}" />
<MenuItem
Command="{Binding BindingContext.DeleteCommand, Mode=OneTime, Source={x:Reference RestaurantsList}}"
CommandParameter="{Binding}"
IsDestructive="True"
Text="Delete" />
</TextCell.ContextActions>
</TextCell>
</TextCell>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
Expand Down