Skip to content

Commit 1b882db

Browse files
SubhamTyagiSubhamTyagi
committed
Merge remote-tracking branch 'origin/kotlin'
2 parents e22bd18 + 32ea216 commit 1b882db

119 files changed

Lines changed: 4698 additions & 556 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ proguard/
4545

4646
# Android Studio captures folder
4747
captures/
48+
.artifacts/
4849

4950
# IntelliJ
5051
*.iml

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@ android {
6060
}
6161
}
6262

63-
lintOptions {
64-
checkReleaseBuilds false
65-
abortOnError false
66-
}
6763

6864
compileOptions {
6965
coreLibraryDesugaringEnabled true
7066
sourceCompatibility JavaVersion.VERSION_1_8
7167
targetCompatibility JavaVersion.VERSION_1_8
7268
}
69+
lint {
70+
abortOnError false
71+
checkReleaseBuilds false
72+
}
7373
}
7474

7575
dependencies {

‎app/proguard-rules.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add project specific ProGuard rules here.
22
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
3+
# proguardFiles setting in build.gradle.kts.
44
#
55
# For more details, see
66
# http://developer.android.com/guide/developing/tools/proguard.html

‎app/src/main/java/io/github/subhamtyagi/ocr/utils/SpUtil.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ public class SpUtil {
2222

2323
public static final String KEY_OCR_PSM_MODE = "key_ocr_psm_mode";
2424
public static final String KEY_TESSERACT_OEM_MODE = "key_tesseract_oem_mode";
25+
2526
public static final String KEY_PRESERVE_INTERWORD_SPACES = "key_preserve_interword_spaces";
2627
public static final String KEY_CHOP_ENABLE = "chop_enable";
2728
public static final String KEY_USE_NEW_STATE_COST = "use_new_state_cost";

‎app/src/main/keepRules/rules.keep‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Add project specific R8 rules here.
2+
# AGP will combine all keep rule files in src/main/keepRules to pass to R8
3+
#
4+
# For more details, see
5+
# https://d.android.com/r/tools/r8/keep-rules
6+
7+
# If your project uses WebView with JS, uncomment the following
8+
# and specify the fully qualified class name to the JavaScript interface
9+
# class:
10+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
11+
# public *;
12+
#}
13+

‎app/src/main/res/drawable/ic_launcher_foreground.xml‎

Lines changed: 19 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -3,86 +3,23 @@
33
android:height="108dp"
44
android:viewportWidth="108"
55
android:viewportHeight="108">
6-
<group android:scaleX="0.33"
7-
android:scaleY="0.33"
8-
android:translateX="21"
9-
android:translateY="21">
10-
<path
11-
android:pathData="M100.53,100.164m-98.886,0a98.886,98.886 0,1 1,197.771 0a98.886,98.886 0,1 1,-197.771 0"
12-
android:strokeLineJoin="round"
13-
android:strokeWidth="2.77146"
14-
android:fillColor="#2869a8"
15-
android:strokeColor="#00000000"
16-
android:strokeLineCap="round"/>
17-
<path
18-
android:pathData="m115.387,197.883 l45.416,-45.416c-60.707,-16.113 -66.374,-7.773 -103.434,36.853 18.4,8.871 39.007,11.553 58.017,8.563z"
19-
android:strokeLineJoin="round"
20-
android:strokeWidth="2.52539"
21-
android:strokeColor="#00000000"
22-
android:strokeLineCap="round">
23-
</path>
24-
<path
25-
android:pathData="m57.37,189.319 l73.346,-73.346c-0.109,-0.039 -4.712,-3.358 -6.791,-3.974l-73.58,73.58c3.18,1.821 3.663,2.284 7.025,3.741z"
26-
android:strokeLineJoin="round"
27-
android:strokeWidth="9.69449"
28-
android:strokeColor="#00000000"
29-
android:strokeLineCap="round">
30-
</path>
31-
<path
32-
android:pathData="m50.345,185.578c9.124,-9.125 110.437,-110.437 110.437,-110.456 -5.884,-1.471 -11.319,-2.81 -16.463,-4.059 -5.144,-1.249 -9.996,-2.407 -14.714,-3.519 -9.436,-2.222 -18.334,-4.254 -27.951,-6.435 -32.762,-7.438 -60.005,-13.621 -60.54,-13.741l-0.973,-0.218 -37.225,37.225a98.704,98.704 89.368,0 0,-1.318 16.074,98.704 98.704,89.368 0,0 48.748,85.129z"
33-
android:strokeLineJoin="round"
34-
android:strokeWidth="10.1202"
35-
android:strokeColor="#00000000"
36-
android:strokeLineCap="round">
37-
</path>
38-
<path
39-
android:pathData="M40.845,47.718l119.325,0l0,26.739l-119.325,0z"
40-
android:strokeLineJoin="round"
41-
android:strokeWidth="2.91711"
42-
android:fillColor="#ffffff"
43-
android:strokeColor="#ffffff"
44-
android:strokeLineCap="round"/>
45-
<path
46-
android:pathData="M40.858,127.515l119.299,0l0,24.307l-119.299,0z"
47-
android:strokeLineJoin="round"
48-
android:strokeWidth="2.96032"
49-
android:fillColor="#ffffff"
50-
android:strokeColor="#ffffff"
51-
android:strokeLineCap="round"/>
52-
<path
53-
android:pathData="m48.922,39.265l-16.188,0l0,14.839"
54-
android:strokeLineJoin="round"
55-
android:strokeWidth="8.99999"
56-
android:fillColor="#00000000"
57-
android:strokeColor="#ffffff"
58-
android:strokeLineCap="round"/>
59-
<path
60-
android:pathData="M168.61,55.453L168.61,39.265l-14.839,0"
61-
android:strokeLineJoin="round"
62-
android:strokeWidth="8.99999"
63-
android:fillColor="#00000000"
64-
android:strokeColor="#ffffff"
65-
android:strokeLineCap="round"/>
66-
<path
67-
android:pathData="m152.422,160.822l16.188,0l0,-14.839"
68-
android:strokeLineJoin="round"
69-
android:strokeWidth="8.99999"
70-
android:fillColor="#00000000"
71-
android:strokeColor="#ffffff"
72-
android:strokeLineCap="round"/>
73-
<path
74-
android:pathData="m32.734,144.375l0,16.188l14.839,0"
75-
android:strokeLineJoin="round"
76-
android:strokeWidth="8.99999"
77-
android:fillColor="#00000000"
78-
android:strokeColor="#ffffff"
79-
android:strokeLineCap="round"/>
80-
<path
81-
android:pathData="M40.816,87.403l89.339,0l0,27.983l-89.339,0z"
82-
android:strokeLineJoin="round"
83-
android:strokeWidth="2.82512"
84-
android:fillColor="#ffffff"
85-
android:strokeColor="#ffffff"
86-
android:strokeLineCap="round"/>
87-
</group>
6+
<group
7+
android:translateX="22"
8+
android:translateY="22">
9+
<!-- Scan Frame / Focus -->
10+
<path
11+
android:fillColor="#00000000"
12+
android:pathData="M8,12 L8,8 L12,8 M52,8 L56,8 L56,12 M56,52 L56,56 L52,56 M12,56 L8,56 L8,52"
13+
android:strokeWidth="4"
14+
android:strokeColor="#FFFFFF"
15+
android:strokeLineCap="round"
16+
android:strokeLineJoin="round" />
17+
<!-- Text Bars -->
18+
<path
19+
android:fillColor="#FFFFFF"
20+
android:pathData="M16,20 L48,20 M16,32 L40,32 M16,44 L48,44"
21+
android:strokeWidth="4"
22+
android:strokeColor="#FFFFFF"
23+
android:strokeLineCap="round" />
24+
</group>
8825
</vector>

‎app/src/main/res/drawable/ic_launcher_monochrome.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="108"
5+
android:viewportHeight="108">
6+
<group
7+
android:translateX="22"
8+
android:translateY="22">
9+
<!-- Scan Frame / Focus -->
10+
<path
11+
android:fillColor="#00000000"
12+
android:pathData="M8,12 L8,8 L12,8 M52,8 L56,8 L56,12 M56,52 L56,56 L52,56 M12,56 L8,56 L8,52"
13+
android:strokeWidth="4"
14+
android:strokeColor="#000000"
15+
android:strokeLineCap="round"
16+
android:strokeLineJoin="round" />
17+
<!-- Text Bars -->
18+
<path
19+
android:fillColor="#000000"
20+
android:pathData="M16,20 L48,20 M16,32 L40,32 M16,44 L48,44"
21+
android:strokeWidth="4"
22+
android:strokeColor="#000000"
23+
android:strokeLineCap="round" />
24+
</group>
25+
</vector>

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/ic_launcher_background"/>
3+
<background android:drawable="@color/ic_launcher_background"/>
44
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5-
</adaptive-icon>
5+
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
6+
</adaptive-icon>

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3-
<background android:drawable="@mipmap/ic_launcher_background"/>
3+
<background android:drawable="@color/ic_launcher_background"/>
44
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5-
</adaptive-icon>
5+
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
6+
</adaptive-icon>

‎app/src/main/res/values/ic_launcher_background.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="ic_launcher_background">#FFFFFF</color>
4-
</resources>
3+
<color name="ic_launcher_background">#6750A4</color>
4+
</resources>

0 commit comments

Comments
 (0)