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.

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

[pull] master from BlinkID:master #41

Open
wants to merge 155 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
cc24663
Automatically built release by Jenkins
Sep 29, 2022
5b8f11e
update version and licenses
krizaa Sep 30, 2022
5240ddf
update to new DirectAPI methods
krizaa Sep 30, 2022
14f3629
update size report
krizaa Sep 30, 2022
7d7a043
Merge pull request #281 from BlinkID/release/v5.19.0
krizaa Sep 30, 2022
75f7f22
Automatically built release by Jenkins
Oct 10, 2022
aaa89d6
update documentation
krizaa Oct 10, 2022
cfeb693
update version and licenses
krizaa Oct 10, 2022
682cfa0
update size report
krizaa Oct 10, 2022
2598867
Merge pull request #282 from BlinkID/release/v5.20.0
krizaa Oct 10, 2022
11a4077
update compileSdkVersion, targetSdkVersion, minSdkVersion and sample app
krizaa Dec 8, 2022
8d19168
Automatically built release by Jenkins
Dec 8, 2022
a1c982c
update sample apps
krizaa Dec 8, 2022
d29a027
Add transition guide for v6.0.0
krizaa Dec 8, 2022
a0c9bdd
update size report
krizaa Dec 8, 2022
7466f87
Automatically built release by Jenkins
Dec 9, 2022
ee3be13
update sample app
krizaa Dec 9, 2022
71a80fb
Merge pull request #284 from BlinkID/release/v6.0.0
krizaa Dec 9, 2022
4cf95e5
fix documentation, remove not needed files
krizaa Dec 9, 2022
5b32613
Merge pull request #285 from BlinkID/fix/documentation-fix
krizaa Dec 9, 2022
3d5df33
Update Release notes.md
krizaa Dec 9, 2022
e260c0e
Rename Transition guide.md to Transition-guide.md
krizaa Dec 9, 2022
2043987
Update Transition-guide.md
krizaa Dec 9, 2022
31c3979
Update Transition-guide.md
krizaa Dec 13, 2022
356d306
Update Transition-guide.md
krizaa Dec 15, 2022
62fc141
update documentation for supported documents
krizaa Jan 12, 2023
de0c497
update the all recognizers sample to include single side reocognizer,…
krizaa Jan 18, 2023
63fa2e9
Merge pull request #288 from BlinkID/update-sample-app
krizaa Jan 18, 2023
56a6f6f
Automatically built release by Jenkins
Feb 6, 2023
14cd8f6
Update sample apps, replace resources import
medvedecrobertmb Feb 6, 2023
a183f69
Fix strings and styles
medvedecrobertmb Feb 6, 2023
4dffd4c
Update version and license
medvedecrobertmb Feb 6, 2023
b1a4bac
Small sample app fix
medvedecrobertmb Feb 6, 2023
997f12f
update size report
krizaa Feb 6, 2023
8c969bc
Merge pull request #290 from BlinkID/release/v6.1.0
medvedecrobertmb Feb 7, 2023
f271f92
Automatically built release by Jenkins
Mar 8, 2023
781779d
Update sample app resources import
medvedecrobertmb Mar 8, 2023
1a4ca2e
Update sample apps permission check
medvedecrobertmb Mar 8, 2023
51d8c75
Update strings and styles
medvedecrobertmb Mar 8, 2023
51bb111
Update licenses and version
medvedecrobertmb Mar 8, 2023
887386f
Automatically built release by Jenkins
Mar 8, 2023
c971fd9
Update sample app resources import
medvedecrobertmb Mar 8, 2023
82a0821
Update sample apps permission check
medvedecrobertmb Mar 8, 2023
4a9c30d
Update licenses and version
medvedecrobertmb Mar 8, 2023
c04565e
fix
medvedecrobertmb Mar 8, 2023
5e47bb0
Merge pull request #291 from BlinkID/release/real-v6.1.1
medvedecrobertmb Mar 8, 2023
0147d00
Automatically built release by Jenkins
Apr 5, 2023
35ead11
Fixed auto-generated resources, strings, and Readme that don't work p…
medvedecrobertmb Apr 5, 2023
252cb2f
Merge pull request #294 from BlinkID/release/v6.1.2
medvedecrobertmb Apr 5, 2023
65cece5
Automatically built release by Jenkins
Jul 13, 2023
e3239ff
BlinkID v6.2.0 RC
medvedecrobertmb Jul 13, 2023
53cb3c6
Merge pull request #295 from BlinkID/release/v6.2.0
medvedecrobertmb Jul 14, 2023
7cd1dbd
Update Readme
medvedecrobertmb Jul 14, 2023
16cfcfd
update size report
krizaa Jul 17, 2023
e96a9a5
update customization images
krizaa Jul 18, 2023
2d23049
Merge pull request #297 from BlinkID/release/v6.2.0
krizaa Jul 18, 2023
cc1bb7d
Automatically built release by Jenkins
Aug 2, 2023
f0bfc7a
Update version,fix resource imports
medvedecrobertmb Aug 2, 2023
eb2946d
Revert local updates
medvedecrobertmb Aug 2, 2023
5bcb635
Merge pull request #298 from BlinkID/release/v6.2.1
medvedecrobertmb Aug 2, 2023
ce5c170
Automatically built release by Jenkins
Aug 25, 2023
95216d6
update SDK version
krizaa Aug 25, 2023
2425bd9
Merge pull request #302 from BlinkID/release/v6.2.2
krizaa Aug 25, 2023
708eb90
Add new sample app that uses MbScan which allows settings customization
medvedecrobertmb Oct 24, 2023
02c2f65
Merge pull request #306 from BlinkID/staging/v6.3.0
medvedecrobertmb Oct 31, 2023
fb55495
Automatically built release by Jenkins
Nov 3, 2023
81b30ef
Update SDK version
medvedecrobertmb Nov 3, 2023
72edd0b
Update sample apps
medvedecrobertmb Nov 3, 2023
60eca54
Update size report
medvedecrobertmb Nov 3, 2023
0f5b39b
Merge pull request #307 from BlinkID/release/v6.3.0
medvedecrobertmb Nov 3, 2023
c8461cb
Automatically built release by Jenkins
Dec 12, 2023
9b066e9
update version
medvedecrobertmb Dec 12, 2023
e7d5fc6
Update sample apps
medvedecrobertmb Dec 12, 2023
8fefc12
Update size-report, revert mavenLocal
medvedecrobertmb Dec 12, 2023
fb4db4f
Update sample license
medvedecrobertmb Dec 12, 2023
b4d636a
Merge pull request #309 from BlinkID/release/v6.4.0
medvedecrobertmb Dec 12, 2023
15cbed4
Automatically built release by Jenkins
Dec 13, 2023
79a540a
Merge pull request #310 from BlinkID/jenkins/stable-build
medvedecrobertmb Dec 13, 2023
7d245f2
update imports
medvedecrobertmb Dec 13, 2023
895ec07
Merge pull request #311 from BlinkID/release/v6.4.0
medvedecrobertmb Dec 13, 2023
9dac427
Fix resources import
medvedecrobertmb Jan 11, 2024
a5262aa
Update resource import for individual classes
medvedecrobertmb Jan 11, 2024
aa6d05a
Merge pull request #312 from BlinkID/fix/resourcesImport
krizaa Jan 18, 2024
e997d54
Automatically built release by Jenkins
Jan 18, 2024
df32b71
update SDK version
krizaa Jan 18, 2024
395fa56
size report
krizaa Jan 18, 2024
f4e3972
Merge pull request #314 from BlinkID/release/v6.5.0
krizaa Jan 18, 2024
e5325d8
Created two new Compose sample apps - one line scan example and fragm…
medvedecrobertmb Jan 17, 2024
a58c2e1
Update compile and target sdk version from 33 to 34, forced JAVA 17 v…
medvedecrobertmb Feb 6, 2024
3ab0530
Removed unused colors.xml files, add mb license to ComposeMinimalSample
medvedecrobertmb Feb 6, 2024
6d444f9
Update new Compose sample apps
medvedecrobertmb Feb 6, 2024
5a3d210
Minor changes
medvedecrobertmb Feb 7, 2024
47fd389
Merge pull request #313 from BlinkID/feature/composeSampleApps
medvedecrobertmb Feb 14, 2024
0dd6e69
Automatically built release by Jenkins
Feb 22, 2024
0ef131b
Update BlinkId version
medvedecrobertmb Feb 23, 2024
58377a7
Minor Compose app changes
medvedecrobertmb Feb 23, 2024
59d19ef
Merge pull request #317 from BlinkID/release/v6.5.1
medvedecrobertmb Feb 23, 2024
cefa9a4
Automatically built release by Jenkins
Mar 21, 2024
98936d4
update version and AGP to 8.2
krizaa Mar 21, 2024
ce88701
update license for 6.6, fixes for sample apps
krizaa Mar 21, 2024
d4120ee
update RN
krizaa Mar 21, 2024
c144509
Merge pull request #318 from BlinkID/release/v6.6.0
krizaa Mar 21, 2024
f14e2f9
run size report, remove local maven repo
krizaa Mar 21, 2024
e92a227
Automatically built release by Jenkins
Mar 26, 2024
36fdce4
update version and licenses
medvedecrobertmb Mar 26, 2024
61d6419
Revert to using license files instead of keys
medvedecrobertmb Mar 26, 2024
18680bf
Remove INTERNET permission from AndroidManifest.xml (it is now includ…
medvedecrobertmb Mar 26, 2024
ce6b9a5
Update release notes
medvedecrobertmb Mar 26, 2024
6c919ad
Merge pull request #320 from BlinkID/release/v6.6.1
medvedecrobertmb Mar 26, 2024
3b7533a
Add transition guide for IdBarcodeRecognizer
mparadina Apr 3, 2024
ec20a2c
Merge pull request #321 from BlinkID/idbarcode-transition-guide
mparadina Apr 4, 2024
5f350e0
add licence for aMinimalSample
krizaa Apr 4, 2024
1e242da
Automatically built release by Jenkins
Apr 23, 2024
199e97b
Update version and all the previous GitHub commits
medvedecrobertmb Apr 23, 2024
58c8e17
Merge branch 'master' into jenkins/stable-build
medvedecrobertmb Apr 23, 2024
4b4fdc8
Documentation fix
medvedecrobertmb Apr 23, 2024
d4146c2
Merge pull request #323 from BlinkID/jenkins/stable-build
medvedecrobertmb Apr 23, 2024
beecadc
Update Release notes.md
medvedecrobertmb Apr 23, 2024
e6c148c
Use license from LibUtils in all sample apps but one (aMinimalSample)
medvedecrobertmb May 14, 2024
59a4f15
Merge pull request #325 from BlinkID/feature/DSE-2293/rework-sample-apps
medvedecrobertmb May 29, 2024
b1276e3
Automatically built release by Jenkins
Jun 6, 2024
fa389d0
Update BlinkID version
medvedecrobertmb Jun 6, 2024
335aeb2
update size report
krizaa Jun 6, 2024
0714420
Merge pull request #326 from BlinkID/release/v6.8.0
medvedecrobertmb Jun 6, 2024
59aec82
Automatically built release by Jenkins
Jul 11, 2024
6073e17
Update license files
medvedecrobertmb Jul 11, 2024
cda9bff
Update version and fix gradle depdendencies
medvedecrobertmb Jul 11, 2024
c9f036f
Update size report
medvedecrobertmb Jul 11, 2024
802ea7c
Update Release notes.md
medvedecrobertmb Jul 11, 2024
294b910
Merge pull request #327 from BlinkID/release/v6.9.0
medvedecrobertmb Jul 11, 2024
f6794e8
Automatically built release by Jenkins
Sep 4, 2024
adc769d
Update size-report
medvedecrobertmb Sep 4, 2024
87abcf6
Update version
medvedecrobertmb Sep 4, 2024
4bf1a55
Kotlin gradle update and fix
medvedecrobertmb Sep 4, 2024
b20a5c1
Merge pull request #329 from BlinkID/release/v6.10.0
medvedecrobertmb Sep 4, 2024
05d57f3
Automatically built release by Jenkins
Sep 30, 2024
7268e74
Updated sample apps for v6.11.0
i1E Oct 1, 2024
e3a4caf
Updated SDK size report
i1E Oct 1, 2024
0e46932
Merge pull request #330 from BlinkID/release/v6.11.0
i1E Oct 1, 2024
5a5dd31
Automatically built release by Jenkins
Oct 1, 2024
05f8172
Updated sample apps for v6.11.1
i1E Oct 1, 2024
6c34fef
Merge pull request #331 from BlinkID/release/6.11.1
i1E Oct 1, 2024
85e442f
Updated SDK size report
i1E Oct 1, 2024
d93b9b7
[samples] reverted target SDK version to 34
i1E Oct 3, 2024
1bb3a62
Automatically built release by Jenkins
Oct 21, 2024
0869c87
Updated sample apps for v6.11.2
i1E Oct 21, 2024
2f4bb42
Merge pull request #333 from BlinkID/release/6.11.2
i1E Oct 21, 2024
5aabd84
Automatically built release by Jenkins
Nov 7, 2024
afd831c
Updated sample apps for v6.12.0
i1E Nov 7, 2024
9ce3e43
Updated SDK size report
i1E Nov 7, 2024
af7eef9
Merge pull request #334 from BlinkID/release/6.12
i1E Nov 7, 2024
7d8a72b
Automatically built release by Jenkins
Dec 19, 2024
84aa5fe
update blinkid version and license key
krizaa Dec 19, 2024
6e6e9c8
run size report
krizaa Dec 20, 2024
9415a9f
Merge pull request #336 from BlinkID/release/v6.13.0
krizaa Dec 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions BlinkIDSample/BlinkID-ComposeFragmentSample/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
55 changes: 55 additions & 0 deletions BlinkIDSample/BlinkID-ComposeFragmentSample/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
namespace 'com.microblink.blinkid'
compileSdk rootProject.ext.compileSdkVersion

defaultConfig {
applicationId "com.microblink.blinkid"
minSdk 21
targetSdk rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"

}

buildTypes {
release {
debuggable true
minifyEnabled true
shrinkResources true
signingConfig signingConfigs.debug
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.15"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
buildFeatures {
compose = true
viewBinding = true
}
}

dependencies {
implementation("com.microblink:blinkid:${rootProject.ext.blinkIdVersion}@aar") {
transitive = true
}
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.compose.material3:material3'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation platform('androidx.compose:compose-bom:2024.09.02')
implementation 'androidx.activity:activity-compose:1.9.2'
implementation 'androidx.fragment:fragment-ktx:1.8.3'
implementation 'androidx.compose.ui:ui-viewbinding:1.7.2'
implementation 'androidx.compose.ui:ui'

implementation project(':LibUtils')
}
21 changes: 21 additions & 0 deletions BlinkIDSample/BlinkID-ComposeFragmentSample/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:name="com.microblink.BlinkIdSampleApp"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name">
<activity
android:name=".MainActivity"
android:exported="true"
android:configChanges="orientation|screenSize"
android:theme="@style/MB_Theme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>

</manifest>
Loading