Skip to content

Commit 207282b

Browse files
DmitryHDmitryH
committed
v3.0.5.5. release
- New wrapper API (more details in Documentation). - Add "Smart Camera" as a ready-to-use UI component. - Minor bug fixes and improvements.
1 parent d96c0c0 commit 207282b

28 files changed

+3490
-2981
lines changed

‎XamarinFormsDemoApplication.Android/MainActivity.cs‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
using Android.Runtime;
66
using Android.OS;
77
using AndroidX.AppCompat.App;
8+
using Android.Graphics;
9+
using Android.Graphics.Drawables;
10+
11+
//namespace AndroidX.AppCompat.Graphics.Drawable
12+
//{
13+
// class DrawableWrapper
14+
// {
15+
// public DrawableWrapper(Android.Graphics.Drawables.Drawable dr)
16+
// {
17+
// }
18+
19+
// public virtual void Draw(Canvas canvas)
20+
// {
21+
22+
// }
23+
// }
24+
25+
//}
826

927
namespace XamarinFormsDemoApplication.Droid
1028
{
@@ -14,10 +32,10 @@ public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompa
1432
{
1533

1634
protected override void OnCreate(Bundle savedInstanceState)
17-
{
35+
{
1836
AppCompatDelegate.DefaultNightMode = AppCompatDelegate.ModeNightNo;
1937
base.OnCreate(savedInstanceState);
20-
38+
2139
Rg.Plugins.Popup.Popup.Init(this);
2240
Xamarin.Essentials.Platform.Init(this, savedInstanceState);
2341
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);

‎XamarinFormsDemoApplication.Android/MyShellRenderer.cs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
using Android.Content;
2+
using Android.Views;
3+
using Xamarin.Forms;
4+
using Xamarin.Forms.Platform.Android;
5+
using XamarinFormsDemoApplication.Droid;
6+
7+
[assembly: ExportRenderer(typeof(Shell), typeof(MyShellRenderer))]
8+
namespace XamarinFormsDemoApplication.Droid
9+
{
10+
public class MyShellRenderer : ShellRenderer
11+
{
12+
public MyShellRenderer(Context context) : base(context)
13+
{
14+
}
15+
protected override IShellFlyoutRenderer CreateShellFlyoutRenderer()
16+
{
17+
var flyoutRenderer = base.CreateShellFlyoutRenderer();
18+
flyoutRenderer.AndroidView.Touch += AndroidView_Touch;
19+
return flyoutRenderer;
20+
}
21+
private void AndroidView_Touch(object sender, Android.Views.View.TouchEventArgs e)
22+
{
23+
if (e.Event.Action == MotionEventActions.Move)
24+
e.Handled = true;
25+
else
26+
e.Handled = false;
27+
}
28+
}
29+
}
30+
31+

‎XamarinFormsDemoApplication.Android/Properties/AndroidManifest.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="2060500" android:versionName="2.6.5" package="com.pixelnetica.dssdk.forms.demo" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="3000505" android:versionName="3.0.5.5" package="com.pixelnetica.dssdk.forms.demo" android:installLocation="auto">
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
44
<application android:label="DocScan SDK Xamarin Forms"> android:requestLegacyExternalStorage="true" </application>
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
66
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
77
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
88
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
9+
<uses-permission android:name="android.permission.CAMERA" />
10+
<uses-permission android:name="android.permission.FLASHLIGHT" />
911
</manifest>

‎XamarinFormsDemoApplication.Android/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
// Minor Version
2323
// Build Number
2424
// Revision
25-
[assembly: AssemblyVersion("2.6.5")]
26-
[assembly: AssemblyFileVersion("2.6.5")]
25+
[assembly: AssemblyVersion("3.0.5.5")]
26+
[assembly: AssemblyFileVersion("3.0.5.5")]
2727

2828
// Add some common permissions, these can be removed if not needed
2929
[assembly: UsesPermission(Android.Manifest.Permission.Internet)]

‎XamarinFormsDemoApplication.Android/Resources/Resource.designer.cs‎

Lines changed: 2803 additions & 2664 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎XamarinFormsDemoApplication.Android/XamarinFormsDemoApplication.Android.csproj‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1717
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1818
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
19-
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
19+
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion>
2020
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
2121
<AndroidUseAapt2>true</AndroidUseAapt2>
2222
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
@@ -28,10 +28,10 @@
2828
<DebugType>portable</DebugType>
2929
<Optimize>false</Optimize>
3030
<OutputPath>bin\Debug</OutputPath>
31-
<DefineConstants>DEBUG;DEBUG_IMG</DefineConstants>
31+
<DefineConstants>DEBUG;_USE_V3_;DEBUG_IMG</DefineConstants>
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
34-
<AndroidLinkMode>None</AndroidLinkMode>
34+
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
3535
<AotAssemblies>false</AotAssemblies>
3636
<EnableLLVM>false</EnableLLVM>
3737
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
@@ -57,23 +57,30 @@
5757
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
5858
</PropertyGroup>
5959
<ItemGroup>
60-
<Reference Include="Mono.Android" />
61-
<Reference Include="System" />
62-
<Reference Include="System.Core" />
63-
</ItemGroup>
64-
<ItemGroup>
60+
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
61+
<Version>3.0.5.5</Version>
62+
</PackageReference>
6563
<PackageReference Include="Rg.Plugins.Popup">
6664
<Version>2.1.0</Version>
6765
</PackageReference>
68-
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
69-
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
70-
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
71-
<Version>2.6.5</Version>
66+
<PackageReference Include="Xamarin.AndroidX.Camera.Camera2">
67+
<Version>1.1.0.1</Version>
68+
</PackageReference>
69+
<PackageReference Include="Xamarin.AndroidX.Camera.Core">
70+
<Version>1.1.0.2</Version>
71+
</PackageReference>
72+
<PackageReference Include="Xamarin.AndroidX.Camera.View">
73+
<Version>1.1.0</Version>
74+
</PackageReference>
75+
<PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
76+
<PackageReference Include="Xamarin.Forms">
77+
<Version>5.0.0.2545</Version>
7278
</PackageReference>
7379
</ItemGroup>
7480
<ItemGroup>
7581
<Compile Include="GetPicturesFolder.cs" />
7682
<Compile Include="MainActivity.cs" />
83+
<Compile Include="MyShellRenderer.cs" />
7784
<Compile Include="Resources\Resource.designer.cs" />
7885
<Compile Include="Properties\AssemblyInfo.cs" />
7986
</ItemGroup>
@@ -132,5 +139,9 @@
132139
<ItemGroup>
133140
<AndroidResource Include="Resources\mipmap\ic_launcher.png" />
134141
</ItemGroup>
142+
<ItemGroup>
143+
<Reference Include="Microsoft.CSharp" />
144+
<Reference Include="Mono.Android" />
145+
</ItemGroup>
135146
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
136-
</Project>
147+
</Project>

‎XamarinFormsDemoApplication.iOS/Info.plist‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<key>UISupportedInterfaceOrientations</key>
1111
<array>
1212
<string>UIInterfaceOrientationPortrait</string>
13+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
1314
<string>UIInterfaceOrientationLandscapeLeft</string>
1415
<string>UIInterfaceOrientationLandscapeRight</string>
1516
</array>
@@ -21,13 +22,13 @@
2122
<string>UIInterfaceOrientationLandscapeRight</string>
2223
</array>
2324
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
25+
<string>8.1</string>
2526
<key>CFBundleDisplayName</key>
2627
<string>EasyScan</string>
2728
<key>CFBundleIdentifier</key>
2829
<string>com.pixelnetica.dssdk.forms.demo</string>
2930
<key>CFBundleVersion</key>
30-
<string>2.6.5</string>
31+
<string>3.0.5.5</string>
3132
<key>UILaunchStoryboardName</key>
3233
<string>LaunchScreen</string>
3334
<key>CFBundleName</key>
@@ -40,5 +41,11 @@
4041
<true/>
4142
<key>UIUserInterfaceStyle</key>
4243
<string>Light</string>
44+
<key>NSCameraUsageDescription</key>
45+
<string>This app needs access to the camera to take photos.</string>
46+
<key>NSPhotoLibraryUsageDescription</key>
47+
<string>This app needs access to photos.</string>
48+
<key>UIMainStoryboardFile</key>
49+
<string>LaunchScreen</string>
4350
</dict>
4451
</plist>

‎XamarinFormsDemoApplication.iOS/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("2.6.5")]
36-
[assembly: AssemblyFileVersion("2.6.5")]
35+
[assembly: AssemblyVersion("3.0.5.5")]
36+
[assembly: AssemblyFileVersion("3.0.5.5")]

‎XamarinFormsDemoApplication.iOS/XamarinFormsDemoApplication.iOS.csproj‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<AssemblyName>XamarinFormsDemoApplication.iOS</AssemblyName>
1515
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
1616
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
17-
<ProvisioningType>manual</ProvisioningType>
17+
<ProvisioningType>automatic</ProvisioningType>
1818
</PropertyGroup>
1919
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
2020
<DebugSymbols>true</DebugSymbols>
@@ -49,18 +49,21 @@
4949
<DebugType>portable</DebugType>
5050
<Optimize>false</Optimize>
5151
<OutputPath>bin\iPhone\Debug</OutputPath>
52-
<DefineConstants>DEBUG</DefineConstants>
52+
<DefineConstants>DEBUG;_USE_V3_;__IOS__;__MOBILE__;__UNIFIED__</DefineConstants>
5353
<ErrorReport>prompt</ErrorReport>
5454
<WarningLevel>4</WarningLevel>
5555
<MtouchArch>ARM64</MtouchArch>
56-
<CodesignKey>iPhone Developer</CodesignKey>
56+
<CodesignKey>Apple Development: Created via API (GTTM72NF79)</CodesignKey>
5757
<MtouchDebug>true</MtouchDebug>
5858
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
5959
<MtouchLink>None</MtouchLink>
6060
<MtouchInterpreter>-all</MtouchInterpreter>
61-
<MtouchExtraArgs> --linkskip libPxl3rdparty -gcc_flags "-lstdc++"</MtouchExtraArgs>
62-
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
63-
<MtouchFloat32>false</MtouchFloat32>
61+
<MtouchExtraArgs> --linkskip libPxl3rdparty --linkskip libPxlImageSDK -gcc_flags "-lstdc++ "</MtouchExtraArgs>
62+
<MtouchNoSymbolStrip>false</MtouchNoSymbolStrip>
63+
<MtouchFloat32>true</MtouchFloat32>
64+
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
65+
<MtouchSdkVersion>16.2</MtouchSdkVersion>
66+
<CodesignProvision>VS: WildCard Development</CodesignProvision>
6467
</PropertyGroup>
6568
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
6669
<DebugType>none</DebugType>
@@ -75,6 +78,10 @@
7578
<MtouchDebug>true</MtouchDebug>
7679
<MtouchLink>Full</MtouchLink>
7780
<CodesignProvision>Automatic</CodesignProvision>
81+
<DefineConstants>_USE_V3_;__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
82+
</PropertyGroup>
83+
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
84+
<AppExtensionDebugBundleId />
7885
</PropertyGroup>
7986
<ItemGroup>
8087
<Compile Include="GetPicturesFolder.cs" />
@@ -153,15 +160,15 @@
153160
<Reference Include="Xamarin.iOS" />
154161
</ItemGroup>
155162
<ItemGroup>
163+
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
164+
<Version>3.0.5.5</Version>
165+
</PackageReference>
156166
<PackageReference Include="Rg.Plugins.Popup">
157167
<Version>2.1.0</Version>
158168
</PackageReference>
159-
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
169+
<PackageReference Include="Xamarin.Essentials" Version="1.7.5" />
160170
<PackageReference Include="Xamarin.Forms">
161-
<Version>5.0.0.2515</Version>
162-
</PackageReference>
163-
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
164-
<Version>2.6.5</Version>
171+
<Version>5.0.0.2545</Version>
165172
</PackageReference>
166173
</ItemGroup>
167174
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
@@ -171,4 +178,4 @@
171178
<Name>XamarinFormsDemoApplication</Name>
172179
</ProjectReference>
173180
</ItemGroup>
174-
</Project>
181+
</Project>

‎XamarinFormsDemoApplication.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Global
2828
EndGlobalSection
2929
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3030
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|Any CPU.Build.0 = Debug|Any CPU
3132
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
3233
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|ARM.ActiveCfg = Debug|Any CPU
3334
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|ARM.Build.0 = Debug|Any CPU

0 commit comments

Comments
 (0)