Skip to content

Commit d96c0c0

Browse files
DmitryHDmitryH
committed
v.2.6.5 release
- Add compatibility with iOS 16 and Xcode 14 - Fix problem with several image types - Minor bug fixes and improvements
1 parent 5e5ce55 commit d96c0c0

File tree

15 files changed

+186
-72
lines changed

15 files changed

+186
-72
lines changed

‎XamarinFormsDemoApplication.Android/MainActivity.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public override void OnRequestPermissionsResult(int requestCode, string[] permis
3737
public override void OnBackPressed()
3838
{
3939
Rg.Plugins.Popup.Popup.SendBackPressed(base.OnBackPressed);
40-
base.OnBackPressed();
40+
//base.OnBackPressed();
4141
}
4242

4343
protected override void OnResume()

‎XamarinFormsDemoApplication.Android/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="2060400" android:versionName="2.6.4.0" package="com.pixelnetica.dssdk.forms.demo" android:installLocation="auto">
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">
33
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
44
<application android:label="DocScan SDK Xamarin Forms"> android:requestLegacyExternalStorage="true" </application>
55
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

‎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.4.0")]
26-
[assembly: AssemblyFileVersion("2.6.4.0")]
25+
[assembly: AssemblyVersion("2.6.5")]
26+
[assembly: AssemblyFileVersion("2.6.5")]
2727

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

‎XamarinFormsDemoApplication.Android/XamarinFormsDemoApplication.Android.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
<Reference Include="System.Core" />
6363
</ItemGroup>
6464
<ItemGroup>
65-
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
66-
<Version>2.6.4</Version>
67-
</PackageReference>
6865
<PackageReference Include="Rg.Plugins.Popup">
6966
<Version>2.1.0</Version>
7067
</PackageReference>
7168
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2515" />
7269
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
70+
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
71+
<Version>2.6.5</Version>
72+
</PackageReference>
7373
</ItemGroup>
7474
<ItemGroup>
7575
<Compile Include="GetPicturesFolder.cs" />
@@ -133,4 +133,4 @@
133133
<AndroidResource Include="Resources\mipmap\ic_launcher.png" />
134134
</ItemGroup>
135135
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
136-
</Project>
136+
</Project>

‎XamarinFormsDemoApplication.iOS/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<string>UIInterfaceOrientationLandscapeRight</string>
2222
</array>
2323
<key>MinimumOSVersion</key>
24-
<string>8.1</string>
24+
<string>11.0</string>
2525
<key>CFBundleDisplayName</key>
2626
<string>EasyScan</string>
2727
<key>CFBundleIdentifier</key>
2828
<string>com.pixelnetica.dssdk.forms.demo</string>
2929
<key>CFBundleVersion</key>
30-
<string>2.6.4.0</string>
30+
<string>2.6.5</string>
3131
<key>UILaunchStoryboardName</key>
3232
<string>LaunchScreen</string>
3333
<key>CFBundleName</key>

‎XamarinFormsDemoApplication.iOS/MyShellRenderer.cs‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
using CoreGraphics;
2+
using Foundation;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Linq;
6+
using System.Text;
7+
using UIKit;
8+
using Xamarin.Forms.Platform.iOS;
9+
using Xamarin.Forms;
10+
11+
12+
[assembly: ExportRenderer(typeof(Shell), typeof(XamarinFormsDemoApplication.iOS.CustomShellRenderer))]
13+
14+
namespace XamarinFormsDemoApplication.iOS
15+
{
16+
public class CustomShellRenderer : ShellRenderer
17+
{
18+
protected override IShellPageRendererTracker CreatePageRendererTracker()
19+
{
20+
return new CustomShellPageRendererTracker(this);
21+
}
22+
}
23+
24+
public class CustomShellPageRendererTracker : ShellPageRendererTracker
25+
{
26+
public CustomShellPageRendererTracker(IShellContext context)
27+
: base(context)
28+
{
29+
30+
}
31+
32+
protected override void UpdateTitleView()
33+
{
34+
if (ViewController == null || ViewController.NavigationItem == null)
35+
return;
36+
37+
var titleView = Shell.GetTitleView(Page);
38+
39+
if (titleView == null)
40+
{
41+
var view = ViewController.NavigationItem.TitleView;
42+
ViewController.NavigationItem.TitleView = null;
43+
view?.Dispose();
44+
}
45+
else
46+
{
47+
var view = new CustomTitleViewContainer(titleView);
48+
ViewController.NavigationItem.TitleView = view;
49+
}
50+
}
51+
}
52+
53+
public class CustomTitleViewContainer : UIContainerView
54+
{
55+
public CustomTitleViewContainer(View view) : base(view)
56+
{
57+
TranslatesAutoresizingMaskIntoConstraints = false;
58+
}
59+
60+
public override CGSize IntrinsicContentSize => UILayoutFittingExpandedSize;
61+
}
62+
}

‎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.4.0")]
36-
[assembly: AssemblyFileVersion("2.6.4.0")]
35+
[assembly: AssemblyVersion("2.6.5")]
36+
[assembly: AssemblyFileVersion("2.6.5")]

‎XamarinFormsDemoApplication.iOS/XamarinFormsDemoApplication.iOS.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
<MtouchInterpreter>-all</MtouchInterpreter>
6161
<MtouchExtraArgs> --linkskip libPxl3rdparty -gcc_flags "-lstdc++"</MtouchExtraArgs>
6262
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
63-
<MtouchFloat32>true</MtouchFloat32>
64-
<MtouchSdkVersion>15.5</MtouchSdkVersion>
63+
<MtouchFloat32>false</MtouchFloat32>
6564
</PropertyGroup>
6665
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
6766
<DebugType>none</DebugType>
@@ -83,6 +82,7 @@
8382
<Compile Include="AppDelegate.cs" />
8483
<None Include="Entitlements.plist" />
8584
<None Include="Info.plist" />
85+
<Compile Include="MyShellRenderer.cs" />
8686
<Compile Include="Properties\AssemblyInfo.cs" />
8787
<EmbeddedResource Include="License.key" />
8888
</ItemGroup>
@@ -153,16 +153,16 @@
153153
<Reference Include="Xamarin.iOS" />
154154
</ItemGroup>
155155
<ItemGroup>
156-
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
157-
<Version>2.6.4</Version>
158-
</PackageReference>
159156
<PackageReference Include="Rg.Plugins.Popup">
160157
<Version>2.1.0</Version>
161158
</PackageReference>
162159
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
163160
<PackageReference Include="Xamarin.Forms">
164161
<Version>5.0.0.2515</Version>
165162
</PackageReference>
163+
<PackageReference Include="Pixelnetica.DocScanSDK.Xamarin.Forms">
164+
<Version>2.6.5</Version>
165+
</PackageReference>
166166
</ItemGroup>
167167
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
168168
<ItemGroup>
@@ -171,4 +171,4 @@
171171
<Name>XamarinFormsDemoApplication</Name>
172172
</ProjectReference>
173173
</ItemGroup>
174-
</Project>
174+
</Project>

‎XamarinFormsDemoApplication.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ 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
3231
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
3332
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|ARM.ActiveCfg = Debug|Any CPU
3433
{AC10482E-8499-41C5-A4C5-CCB805270074}.Debug|ARM.Build.0 = Debug|Any CPU

‎XamarinFormsDemoApplication/Popup/ProfileDialogPage.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ private void _StrongShadows_CheckedChanged(object sender, CheckedChangedEventArg
4949

5050
private void R_CheckedChanged(object sender, CheckedChangedEventArgs e)
5151
{
52+
if (!e.Value) return ;
53+
5254
string value = (string)((RadioButton)sender).Content;
5355
foreach(var p in Processing.Instance.Profiles)
5456
{

0 commit comments

Comments
 (0)