Skip to content

Commit

Permalink
Merge pull request #4 from blinkinput/releas/v4.3.0
Browse files Browse the repository at this point in the history
Releas/v4.3.0
  • Loading branch information
juraskrlec authored May 27, 2020
2 parents 28853fb + e301e49 commit 4a66bf1
Show file tree
Hide file tree
Showing 395 changed files with 43,676 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Binding/Android/Jars/LibBlinkInput.aar filter=lfs diff=lfs merge=lfs -text
Binding/iOS/Microblink.framework/ filter=lfs diff=lfs merge=lfs -text
Binding/iOS/Microblink.framework/Microblink filter=lfs diff=lfs merge=lfs -text
98 changes: 98 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

# Exe files
*.exe

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata/

## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint
.DS_Store

## Obj-C/Swift specific
*.hmap
*.ipa

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md

fastlane/report.xml
fastlane/screenshots

# Autosave files
*~

# build
[Oo]bj/
[Bb]in/
packages/
TestResults/

# globs
Makefile.in
*.DS_Store
*.sln.cache
*.suo
*.cache
*.pidb
*.userprefs
*.usertasks
config.log
config.make
config.status
aclocal.m4
install-sh
autom4te.cache/
*.user
*.tar.gz
tarballs/
test-results/
Thumbs.db
.vs/

# Mac bundle stuff
*.dmg
*.app

# resharper
*_Resharper.*
*.Resharper

# dotCover
*.dotCover
1 change: 1 addition & 0 deletions Binding/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
packages
40 changes: 40 additions & 0 deletions Binding/Android/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#Autosave files
*~

#build
[Oo]bj/
[Bb]in/
packages/
TestResults/

# globs
Makefile.in
*.DS_Store
*.sln.cache
*.suo
*.cache
*.pidb
*.userprefs
*.usertasks
config.log
config.make
config.status
aclocal.m4
install-sh
autom4te.cache/
*.user
*.tar.gz
tarballs/
test-results/
Thumbs.db

#Mac bundle stuff
*.dmg
*.app

#resharper
*_Resharper.*
*.Resharper

#dotCover
*.dotCover
48 changes: 48 additions & 0 deletions Binding/Android/Additions/AboutAdditions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
Additions allow you to add arbitrary C# to the generated classes
before they are compiled. This can be helpful for providing convenience
methods or adding pure C# classes.

== Adding Methods to Generated Classes ==

Let's say the library being bound has a Rectangle class with a constructor
that takes an x and y position, and a width and length size. It will look like
this:

public partial class Rectangle
{
public Rectangle (int x, int y, int width, int height)
{
// JNI bindings
}
}

Imagine we want to add a constructor to this class that takes a Point and
Size structure instead of 4 ints. We can add a new file called Rectangle.cs
with a partial class containing our new method:

public partial class Rectangle
{
public Rectangle (Point location, Size size) :
this (location.X, location.Y, size.Width, size.Height)
{
}
}

At compile time, the additions class will be added to the generated class
and the final assembly will a Rectangle class with both constructors.


== Adding C# Classes ==

Another thing that can be done is adding fully C# managed classes to the
generated library. In the above example, let's assume that there isn't a
Point class available in Java or our library. The one we create doesn't need
to interact with Java, so we'll create it like a normal class in C#.

By adding a Point.cs file with this class, it will end up in the binding library:

public class Point
{
public int X { get; set; }
public int Y { get; set; }
}
228 changes: 228 additions & 0 deletions Binding/Android/AndroidBinding.csproj

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions Binding/Android/AndroidBinding.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndroidBinding", "AndroidBinding.csproj", "{80F7D444-771D-4C21-A8AC-D575A7712E55}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{80F7D444-771D-4C21-A8AC-D575A7712E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80F7D444-771D-4C21-A8AC-D575A7712E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80F7D444-771D-4C21-A8AC-D575A7712E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80F7D444-771D-4C21-A8AC-D575A7712E55}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
36 changes: 36 additions & 0 deletions Binding/Android/Jars/AboutJars.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
This directory is for Android .jars.

There are 4 types of jars that are supported:

== Input Jar and Embedded Jar ==

This is the jar that bindings should be generated for.

For example, if you were binding the Google Maps library, this would
be Google's "maps.jar".

The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
embedded in the resulting dll as EmbeddedResource, while InputJar is not.
There are couple of reasons you wouldn't like to embed the target jar
in your dll (the ones that could be internally loaded by <uses-library>
feature e.g. maps.jar, or you cannot embed jars that are under some
proprietary license).

Set the build action for these jars in the properties page to "InputJar".


== Reference Jar and Embedded Reference Jar ==

These are jars that are referenced by the input jar. C# bindings will
not be created for these jars. These jars will be used to resolve
types used by the input jar.

NOTE: Do not add "android.jar" as a reference jar. It will be added automatically
based on the Target Framework selected.

Set the build action for these jars in the properties page to "ReferenceJar".

"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
embedded in your dll. But at application build time, they are not included
in the final apk, like ReferenceJar files.

3 changes: 3 additions & 0 deletions Binding/Android/Jars/LibBlinkInput.aar
Git LFS file not shown
27 changes: 27 additions & 0 deletions Binding/Android/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.

[assembly: AssemblyTitle("BlinkInputAARBinding")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("${AuthorCopyright}")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion("1.0.0")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.

//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
19 changes: 19 additions & 0 deletions Binding/Android/Transforms/EnumFields.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<enum-field-mappings>
<!--
This example converts the constants Fragment_id, Fragment_name,
and Fragment_tag from android.support.v4.app.FragmentActivity.FragmentTag
to an enum called Android.Support.V4.App.FragmentTagType with values
Id, Name, and Tag.
<mapping clr-enum-type="Android.Support.V4.App.FragmentTagType" jni-class="android/support/v4/app/FragmentActivity$FragmentTag">
<field clr-name="Id" jni-name="Fragment_id" value="1" />
<field clr-name="Name" jni-name="Fragment_name" value="0" />
<field clr-name="Tag" jni-name="Fragment_tag" value="2" />
</type>
Notes:
- An optional "bitfield" attribute marks the enum type with [Flags].
- For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
-->
</enum-field-mappings>
19 changes: 19 additions & 0 deletions Binding/Android/Transforms/EnumMethods.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<enum-method-mappings>
<!--
This example changes the Java method:
android.support.v4.app.Fragment.SavedState.writeToParcel (int flags)
to be:
android.support.v4.app.Fragment.SavedState.writeToParcel (Android.OS.ParcelableWriteFlags flags)
when bound in C#.
<mapping jni-class="android/support/v4/app/Fragment.SavedState">
<method jni-name="writeToParcel" parameter="flags" clr-enum-type="Android.OS.ParcelableWriteFlags" />
</mapping>
Notes:
- For Java interfaces, use "jni-interface" attribute instead of "jni-class" attribute.
- To change the type of the return value, use "return" as the parameter name.
- The parameter names will be p0, p1, ... unless you provide JavaDoc file in the project.
-->
</enum-method-mappings>
37 changes: 37 additions & 0 deletions Binding/Android/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<remove-node path="/api/package[starts-with(@name, 'com.microblink.secured')]" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.library')]" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.hardware')]/class[@name!='CameraSettings' and @extends!='java.lang.Enum']" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.ocr')]" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.recognizers')]/class[@name!='BaseLegacyRecognizerWrapper' and @name!='BaseLegacyRecognizerWrapper.Result' and @name!='RecognizerSettings' and @name!='BaseRecognitionResult']" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.recognizers')]/interface[@name!='MRTDResult']" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.detectors')]" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.geometry')]/class[@name!='Point' and @name!='Quadrilateral']" />
<remove-node path="/api/package[@name='com.microblink.image']/class[@name!='Image']" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.recognition')]/class[@name!='RecognizerSuccessType']" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.recognition')]/interface" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.settings')]" />
<remove-node path="/api/package[@name='com.microblink.util']/class[not(starts-with(@name, 'RecognizerCompatibility') or @name='Log')]" />
<remove-node path="/api/package[@name='com.microblink.util']/interface" />
<remove-node path="/api/package[@name='com.microblink.activity']" />

<remove-node path="/api/package[starts-with(@name, 'com.microblink.view')]/class[@extends!='java.lang.Enum']" />

<remove-node path="//*[@visibility!='public']" />

<remove-node path="/api/package[@name='com.microblink.entities']/class[@name='Entity']/method[@name!='writeToParcel' and @name!='describeContents' and @name!='getResult']" />
<remove-node path="/api/package[@name='com.microblink.entities']/class[@name='Entity.Result']/method[@name!='writeToParcel' and @name!='describeContents']" />

<remove-node path="/api/package[starts-with(@name, 'com.microblink.entities')]/class[substring(@name, string-length(@name) - string-length('.RecognizerCreator') + 1) = '.RecognizerCreator']" />
<remove-node path="/api/package[starts-with(@name, 'com.microblink.entities')]/*/field[@name='CLASS_NAME']" />

<remove-node path="/api/package[@name='com.microblink.entities.parsers']/class[@name='Parser']/method[@name='consumeResult']" />

<remove-node path="/api/package[starts-with(@name, 'com.microblink.entities')]/class/method[@name='consumeResultFrom']" />

<remove-node path="/api/package[starts-with(@name, 'com.microblink.entities')]/class/method[@name='clone']" />

<remove-node path="/api/package[@name='com.microblink.fragment']/class[@name='RecognizerRunnerFragment']/method[@name='onRequestPermissionsResult' and count(parameter)=3 and parameter[1][@type='int'] and parameter[2][@type='java.lang.String[]'] and parameter[3][@type='int[]']]" />

</metadata>
35 changes: 35 additions & 0 deletions Binding/Android/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NuGet.Build.Packaging" version="0.2.2" targetFramework="monoandroid81" developmentDependency="true" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Core.Runtime" version="1.1.1.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData" version="1.1.1.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.LiveData.Core" version="1.1.1.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Arch.Lifecycle.ViewModel" version="1.1.1.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Annotations" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.AsyncLayoutInflater" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Collections" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Compat" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CoordinaterLayout" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CursorAdapter" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.CustomView" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DocumentFile" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.DrawerLayout" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Fragment" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Interpolator" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Loader" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.LocalBroadcastManager" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Print" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SlidingPaneLayout" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.SwipeRefreshLayout" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.ViewPager" version="28.0.0.3" targetFramework="monoandroid90" />
</packages>
Loading

0 comments on commit 4a66bf1

Please sign in to comment.