Skip to content

Commit a2aea05

Browse files
mierzynskimknocte
mierzynskim
authored and
knocte
committed
GTK rendering support
Upstream PR: Redth#798 Fixes Redth#797
1 parent 034bb00 commit a2aea05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+312
-22
lines changed

‎Samples/Sample.Android/Sample.Android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393
<PackageReference Include="Xamarin.AndroidX.Browser">
9494
<Version>1.3.0.4</Version>
9595
</PackageReference>
96-
<PackageReference Include="Xamarin.Essentials">
97-
<Version>1.6.0</Version>
96+
<PackageReference Include="DotNetEssentials">
97+
<Version>1.6.0--date20220814-0324.git-7f6e466</Version>
9898
</PackageReference>
9999
</ItemGroup>
100100
</Project>

‎Samples/Sample.Forms/Sample.Forms.Android/Sample.Forms.Android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
</Reference>
5858
</ItemGroup>
5959
<ItemGroup>
60-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
61-
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
60+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
61+
<PackageReference Include="DotNetEssentials" Version="1.6.0--date20220814-0324.git-7f6e466" />
6262
</ItemGroup>
6363
<ItemGroup>
6464
<Compile Include="MainActivity.cs" />

‎Samples/Sample.Forms/Sample.Forms.Tizen/Sample.Forms.Tizen.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<ExcludeAssets>Runtime</ExcludeAssets>
2727
</PackageReference>
2828
<PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
29-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
29+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
3030
</ItemGroup>
3131
<ItemGroup>
3232
<ProjectReference Include="..\..\..\ZXing.Net.Mobile\ZXing.Net.Mobile.csproj" />

‎Samples/Sample.Forms/Sample.Forms.UWP/Sample.Forms.UWP.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@
143143
</Page>
144144
</ItemGroup>
145145
<ItemGroup>
146-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
146+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
147147
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
148-
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
148+
<PackageReference Include="DotNetEssentials" Version="1.6.0--date20220814-0324.git-7f6e466" />
149149
</ItemGroup>
150150
<ItemGroup>
151151
<ProjectReference Include="..\..\..\ZXing.Net.Mobile.Forms\ZXing.Net.Mobile.Forms.csproj">

‎Samples/Sample.Forms/Sample.Forms.iOS/Sample.Forms.iOS.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@
126126
<Reference Include="System.Numerics.Vectors" />
127127
</ItemGroup>
128128
<ItemGroup>
129-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
130-
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
129+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
130+
<PackageReference Include="DotNetEssentials" Version="1.6.0--date20220814-0324.git-7f6e466" />
131131
</ItemGroup>
132132
<ItemGroup>
133133
<ProjectReference Include="..\..\..\ZXing.Net.Mobile.Forms\ZXing.Net.Mobile.Forms.csproj">

‎Samples/Sample.Forms/Sample.Forms/Sample.Forms.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
15-
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
14+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
15+
<PackageReference Include="DotNetEssentials" Version="1.6.0--date20220814-0324.git-7f6e466" />
1616
<PackageReference Include="ZXing.Net" Version="0.16.6" />
1717
</ItemGroup>
1818

‎Samples/Sample.Uwp/Sample.Uwp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@
160160
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
161161
<Version>6.2.11</Version>
162162
</PackageReference>
163-
<PackageReference Include="Xamarin.Essentials">
164-
<Version>1.6.0</Version>
163+
<PackageReference Include="DotNetEssentials">
164+
<Version>1.6.0--date20220814-0324.git-7f6e466</Version>
165165
</PackageReference>
166166
</ItemGroup>
167167
<ItemGroup>

‎Samples/Sample.iOS/Sample.iOS.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
</Reference>
104104
</ItemGroup>
105105
<ItemGroup>
106-
<PackageReference Include="Xamarin.Essentials">
107-
<Version>1.6.0</Version>
106+
<PackageReference Include="DotNetEssentials">
107+
<Version>1.6.0--date20220814-0324.git-7f6e466</Version>
108108
</PackageReference>
109109
<PackageReference Include="Xamarin.TestCloud.Agent" Version="0.22.1" />
110110
</ItemGroup>

‎ZXing.Net.Mobile.Forms/Platform.gtk.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using System;
2+
3+
namespace ZXing.Net.Mobile.Forms.GTK
4+
{
5+
public class Platform
6+
{
7+
public static void Init ()
8+
{
9+
ZXing.Net.Mobile.Forms.GTK.ZXingBarcodeImageViewRenderer.Init();
10+
}
11+
}
12+
}

‎ZXing.Net.Mobile.Forms/ZXing.Net.Mobile.Forms.csproj‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid10.0;tizen40</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.Mac20;MonoAndroid10.0;tizen40;net461</TargetFrameworks>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299;</TargetFrameworks>
55
<AssemblyName>ZXing.Net.Mobile.Forms</AssemblyName>
66
<RootNamespace>ZXing.Net.Mobile.Forms</RootNamespace>
@@ -69,7 +69,7 @@
6969
<Compile Include="**\*.android.cs" />
7070
<Compile Include="**\*.android.*.cs" />
7171
<AndroidResource Include="Resources\xml\*.xml" />
72-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.6" />
72+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.1.1" />
7373
</ItemGroup>
7474
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
7575
<Compile Include="**\*.ios.cs" />
@@ -86,9 +86,23 @@
8686
<Compile Include="**\*.tizen.cs" />
8787
<Compile Include="**\*.tizen.*.cs" />
8888
</ItemGroup>
89+
<ItemGroup Condition=" $(TargetFramework.StartsWith('net461')) ">
90+
<PackageReference Include="DotNetForms.Platform.GTK" Version="5.0.0.2515--date20220812-0259.git-cf6f7a9" />
91+
<Reference Include="glib-sharp">
92+
<HintPath>..\ZXing.Net.Mobile\GTK\Libs\gtk-sharp\gtk-sharp-2.0\glib-sharp.dll</HintPath>
93+
</Reference>
94+
<Reference Include="gtk-sharp">
95+
<HintPath>..\ZXing.Net.Mobile\GTK\Libs\gtk-sharp\gtk-sharp-2.0\gtk-sharp.dll</HintPath>
96+
</Reference>
97+
<Reference Include="gdk-sharp">
98+
<HintPath>..\ZXing.Net.Mobile\GTK\Libs\gtk-sharp\gtk-sharp-2.0\gdk-sharp.dll</HintPath>
99+
</Reference>
100+
<Compile Include="**\*.gtk.cs" />
101+
<Compile Include="**\*.gtk.*.cs" />
102+
</ItemGroup>
89103
<ItemGroup>
90-
<PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
91-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1874" />
104+
<PackageReference Include="DotNetEssentials" Version="1.6.0--date20220814-0324.git-7f6e466" />
105+
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
92106
<PackageReference Include="ZXing.Net" Version="0.16.6" />
93107
</ItemGroup>
94108
<ItemGroup>

0 commit comments

Comments
 (0)