Merge branch 'master' of https://github.com/WriteCodeEveryday/Camera2Label

Author: WriteCodeEveryday

.gitignore

@@ -11,4 +11,10 @@
 /build
 /captures
 .externalNativeBuild
-.cxx
+<<<<<<< HEAD
+.cxx
+=======
+.cxx
+
+/BrotherPrintLibrary/
+>>>>>>> b172c2df64b21b7735d5314a9a6b913c7392542d

README.md

@@ -2,7 +2,7 @@
 
 <img align="right" src="./screenshots/screenshot-scan-options.jpg" data-canonical-src="./screenshots/screenshot-scan-options.jpg" width="216" height="432"/>
 
-**Allowing you to use your camera to build labels from Driver's Licenses, Camera2Label Labels or existing labels**
+**Use your phone camera to build labels from Driver's Licenses, or existing labels**
 
 Camera2Label supports generating, saving and printing labels from Driver's Licenses, Camera2Label Labels, or existing labels.
 
@@ -14,3 +14,18 @@ This is a Native Android application targeting SDK version 19 or higher (Android
 
 A full gradle project is provided but there are dependencies that are not bundled.
 **Dependencies:** [Brother Print Library](https://developerprogram.brother-usa.com/sdk-download)
+
+# Sample files used for testing.
+
+## 2-Lined Labels
+<img src="./samples/sample_2_label.jpg"/>
+<img src="./samples/sample_2_label.PNG"/>
+
+## 3-Lined Labels
+<img src="./samples/sample_3_label.png"/>
+
+## 4-Lined Labels
+<img src="./samples/sample_4_label.jpg"/>
+
+## License Rear - PDF417
+<img src="./samples/sample_pdf417.PNG"/>

app/build.gradle

@@ -8,8 +8,13 @@ android {
         applicationId "com.challenge.license2label"
         minSdkVersion 19
         targetSdkVersion 28
+<<<<<<< HEAD
         versionCode 2
         versionName "2.0-BUGFIX"
+=======
+        versionCode 1
+        versionName "1.0"
+>>>>>>> b172c2df64b21b7735d5314a9a6b913c7392542d
         multiDexEnabled true
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"