Skip to content

Commit cba5bc6

Browse files
authored
Merge pull request #344 from doo/dd/EPIC-4054-adjust-for-RTU-UI-v2
[EPIC-4194, EPIC-4054] Android 5.0
2 parents 7508373 + 4877f0c commit cba5bc6

File tree

100 files changed

+2488
-1369
lines changed

Some content is hidden

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

100 files changed

+2488
-1369
lines changed

Libraries.txt

+34-23
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Open Source libraries used in the Scanbot SDK for Android version 4.2.0
2-
1+
Open Source libraries used in the Scanbot SDK for Android version 5.0.0
32
CWAC-Camera
43

54
Version 0.6.42
@@ -959,7 +958,7 @@ JSON for Modern C++
959958
Version v3.11.2
960959
(https://github.com/nlohmann/json)
961960

962-
MIT License
961+
MIT License
963962

964963
Copyright (c) 2013-2022 Niels Lohmann
965964

@@ -1030,18 +1029,18 @@ Copyright (C) 2007-2009 Antony Dovgal
10301029

10311030
This software is provided 'as-is', without any express or implied warranty.
10321031

1033-
In no event will the authors be held liable for any damages arising from the
1032+
In no event will the authors be held liable for any damages arising from the
10341033
use of this software.
10351034

1036-
Permission is granted to anyone to use this software for any purpose,including
1037-
commercial applications, and to alter it and redistribute it freely, subject
1035+
Permission is granted to anyone to use this software for any purpose,including
1036+
commercial applications, and to alter it and redistribute it freely, subject
10381037
to the following restrictions:
10391038

1040-
1. The origin of this software must not be misrepresented; you must not claim
1041-
that you wrote the original software. If you use this software in a
1042-
product, an acknowledgment in the product documentation would be
1039+
1. The origin of this software must not be misrepresented; you must not claim
1040+
that you wrote the original software. If you use this software in a
1041+
product, an acknowledgment in the product documentation would be
10431042
appreciated but is not required.
1044-
2. Altered source versions must be plainly marked as such, and must not be
1043+
2. Altered source versions must be plainly marked as such, and must not be
10451044
misrepresented as being the original software.
10461045
3. This notice may not be removed or altered from any source distribution.
10471046

@@ -1340,26 +1339,38 @@ Version 4.2.0
13401339
Copyright (c) 1988-1997 Sam Leffler
13411340
Copyright (c) 1991-1997 Silicon Graphics, Inc.
13421341

1343-
Permission to use, copy, modify, distribute, and sell this software and
1342+
Permission to use, copy, modify, distribute, and sell this software and
13441343
its documentation for any purpose is hereby granted without fee, provided
13451344
that (i) the above copyright notices and this permission notice appear in
13461345
all copies of the software and related documentation, and (ii) the names of
13471346
Sam Leffler and Silicon Graphics may not be used in any advertising or
13481347
publicity relating to the software without the specific, prior written
13491348
permission of Sam Leffler and Silicon Graphics.
13501349

1351-
THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
1352-
EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
1353-
WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
1350+
THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
1351+
EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
1352+
WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
13541353

13551354
IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
13561355
ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
13571356
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
1358-
WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
1359-
LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
1357+
WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
1358+
LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
13601359
OF THIS SOFTWARE.
13611360

13621361

1362+
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
1363+
1364+
libzueci
1365+
1366+
Version 1.0.0
1367+
(https://sourceforge.net/projects/libzueci/)
1368+
1369+
A simple, standalone, BSD-3-Clause C library for converting UTF-8 to/from Extended Channel Interpretations, as
1370+
defined by AIM ITS/04-023 International Technical Standard - Extended Channel Interpretations Part 3: Register
1371+
(Version 2, February 2022).
1372+
1373+
13631374
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
13641375

13651376
magic-enum
@@ -1657,7 +1668,7 @@ Version 1.1.0h
16571668
* are met:
16581669
*
16591670
* 1. Redistributions of source code must retain the above copyright
1660-
* notice, this list of conditions and the following disclaimer.
1671+
* notice, this list of conditions and the following disclaimer.
16611672
*
16621673
* 2. Redistributions in binary form must reproduce the above copyright
16631674
* notice, this list of conditions and the following disclaimer in
@@ -1712,21 +1723,21 @@ Version 1.1.0h
17121723
* This package is an SSL implementation written
17131724
* by Eric Young (eay@cryptsoft.com).
17141725
* The implementation was written so as to conform with Netscapes SSL.
1715-
*
1726+
*
17161727
* This library is free for commercial and non-commercial use as long as
17171728
* the following conditions are aheared to. The following conditions
17181729
* apply to all code found in this distribution, be it the RC4, RSA,
17191730
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
17201731
* included with this distribution is covered by the same copyright terms
17211732
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
1722-
*
1733+
*
17231734
* Copyright remains Eric Young's, and as such any Copyright notices in
17241735
* the code are not to be removed.
17251736
* If this package is used in a product, Eric Young should be given attribution
17261737
* as the author of the parts of the library used.
17271738
* This can be in the form of a textual message at program startup or
17281739
* in documentation (online or textual) provided with the package.
1729-
*
1740+
*
17301741
* Redistribution and use in source and binary forms, with or without
17311742
* modification, are permitted provided that the following conditions
17321743
* are met:
@@ -1741,10 +1752,10 @@ Version 1.1.0h
17411752
* Eric Young (eay@cryptsoft.com)"
17421753
* The word 'cryptographic' can be left out if the rouines from the library
17431754
* being used are not cryptographic related :-).
1744-
* 4. If you include any Windows specific code (or a derivative thereof) from
1755+
* 4. If you include any Windows specific code (or a derivative thereof) from
17451756
* the apps directory (application code) you must include an acknowledgement:
17461757
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
1747-
*
1758+
*
17481759
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
17491760
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
17501761
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -1756,7 +1767,7 @@ Version 1.1.0h
17561767
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
17571768
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
17581769
* SUCH DAMAGE.
1759-
*
1770+
*
17601771
* The licence and distribution terms for any publically available version or
17611772
* derivative of this code cannot be changed. i.e. this code cannot simply be
17621773
* copied and put under another distribution licence

classical-components-demo/adjustable-filters/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43
apply plugin: 'kotlin-kapt'
54

65
android {
@@ -25,6 +24,11 @@ android {
2524
sourceCompatibility JavaVersion.VERSION_1_8
2625
targetCompatibility JavaVersion.VERSION_1_8
2726
}
27+
28+
buildFeatures {
29+
viewBinding = true
30+
buildConfig = true
31+
}
2832
}
2933

3034
configurations {

classical-components-demo/adjustable-filters/src/main/AndroidManifest.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package="io.scanbot.example">
44

55
<uses-permission android:name="android.permission.CAMERA" />
6+
<uses-permission android:name="android.permission.VIBRATE" />
67

78
<uses-feature android:name="android.hardware.camera" />
89

@@ -16,14 +17,15 @@
1617
<activity
1718
android:name=".SelectImageActivity"
1819
android:label="@string/app_name"
19-
android:screenOrientation="portrait">
20+
android:screenOrientation="portrait"
21+
android:exported="true">
2022
<intent-filter>
2123
<action android:name="android.intent.action.MAIN" />
2224

2325
<category android:name="android.intent.category.LAUNCHER" />
2426
</intent-filter>
2527
</activity>
26-
<activity android:name=".FilterTunesActivity" android:screenOrientation="portrait" />
28+
<activity android:name=".FilterActivity" android:screenOrientation="portrait" />
2729
</application>
2830

2931
</manifest>

classical-components-demo/adjustable-filters/src/main/java/io/scanbot/example/ExampleApplication.kt

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class ExampleApplication : Application() {
3232
}
3333
}
3434
//.sdkFilesDirectory(this, getExternalFilesDir(null)!!)
35-
.imageProcessorType(ImageProcessor.Type.ML_BASED)
3635
.initialize(this)
3736

3837
LoggerProvider.logger.d("ExampleApplication", "Scanbot SDK was initialized")

0 commit comments

Comments
 (0)