summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-10-21Merge pull request #726 from yuchan2215/patch-1HEADmasterRalf Kistner1-1/+1
Fix Typo
2022-10-21Fix Typoyuchan22151-1/+1
2022-06-16Merge pull request #708 from amirrudd/patch-1Ralf Kistner1-1/+1
Remove duplicate in ReadMe
2022-06-16Remove duplicate in ReadMeAmir Rudd1-1/+1
2022-02-21Merge pull request #696 from saifkhichi96/patch-1Ralf Kistner2-6/+16
Added ability to customize colors in barcodes generated with BarcodeEncoder.
2022-02-08Added color customization instructions in READMEMuhammad Saif Ullah Khan1-3/+5
2022-02-08Support custom colors in BarcodeEncoder.java.Muhammad Saif Ullah Khan1-3/+11
2021-12-22Update README.mdConrad Hofmeyr1-1/+1
2021-11-17Merge pull request #673 from juliansteenbakker/make-initializeAttributes-publicRalf Kistner1-1/+1
imp: make initializeAttributes public
2021-11-17imp: make initializeAttributes publicjuliansteenbakker1-1/+1
2021-10-26Merge pull request #666 from journeyapps/update-readme-sdk-versionRalf Kistner1-9/+38
Update notes on minSdkVersion
2021-10-26Update notes on minSdkVersion.Ralf Kistner1-9/+38
2021-10-25Merge pull request #665 from journeyapps/fixesv4.3.0Ralf Kistner23-364/+798
v4.3.0
2021-10-25Fix lint report location.Ralf Kistner1-1/+1
2021-10-25Ignore lint error.Ralf Kistner1-0/+8
2021-10-25Tweaks.Ralf Kistner2-1/+7
2021-10-25Use GitHub Actions.Ralf Kistner2-36/+16
2021-10-25v4.3.0 and cleanup.Ralf Kistner4-30/+33
2021-10-25Cleanup.Ralf Kistner1-21/+2
2021-10-25ScanOptions and ScanContract.Ralf Kistner9-140/+549
2021-10-25minSdkVersion 19. Multidex and desugaring.Ralf Kistner3-19/+46
2021-10-25Smaller libs.Ralf Kistner1-3/+4
2021-10-25Some cleanup.Ralf Kistner1-2/+1
2021-10-25Disable jetifier.Ralf Kistner1-1/+1
2021-10-25Upgrade tooling.Ralf Kistner5-129/+145
2021-10-25Fix lint issues.Ralf Kistner4-10/+8
2021-10-25Fix API 19 crash.Ralf Kistner1-2/+8
2021-03-15Merge pull request #617 from journeyapps/maven-centralv4.2.0Ralf Kistner4-25/+80
Maven Central
2021-03-15Update metadata and scripts for Maven Central.travis-testRalf Kistner4-25/+80
2021-02-12Merge pull request #605 from devzeze/devzeze-fix556Ralf Kistner1-0/+10
fix #556 add licenses to POM
2021-02-12Merge pull request #587 from ANewGalaxy/masterRalf Kistner1-17/+15
Fixing MediaPlayer warnings;
2021-02-12Merge pull request #609 from nodh/feature/preventclassclashRalf Kistner4-5/+4
Move CameraConfigurationUtils to prevent clash with other ZXing libraries
2021-02-12Move CameraConfigurationUtils to prevent clash with ↵Christian Kollmann4-5/+4
com.google.zxing:android-core
2021-02-03fix #556devzeze1-0/+10
2020-12-12Replaced setAudioStreamType method call with setAudioAttributes call to fix ↵ANewGalaxy1-2/+3
warnings about stream types. Also removed unused import.
2020-12-12Added reset calls before each release callANewGalaxy1-15/+12
2020-12-12Fixing MediaPlayer warnings;ANewGalaxy0-0/+0
2020-02-11Update readme.Ralf Kistner1-13/+14
2020-02-11Merge branch 'master' of github.com:journeyapps/zxing-android-embeddedRalf Kistner5-15/+19
2020-01-31Update README.mdRalf Kistner1-1/+1
Fix the version.
2020-01-17Merge pull request #530 from lukassos/masterRalf Kistner1-2/+2
correct release version 4.0.2
2020-01-17correct release version 4.0.2Lukassos1-2/+2
After two days of headaches, looked into CHANGES.md where 4.0.0 is marked as broken - we should use 4.0.2
2020-01-08Merge pull request #529 from hannesa2/ReduceTravisBuildsRalf Kistner1-9/+14
Reduce Travis builds
2020-01-08Merge pull request #528 from hannesa2/AndroidStudio-3.5.3Ralf Kistner3-3/+2
Android Studio 3.5.3
2020-01-07Reduce Travis buildsHannes Achleitner1-9/+14
2020-01-07Android Studio 3.5.3Hannes Achleitner3-3/+2
2020-01-07Release 4.1.0v4.1.0Ralf Kistner3-3/+9
2020-01-07Camera permission behaviour (#505)Andre Ippisch6-30/+118
* Remove unused else * Remove SDK version check since we are on minimum 24 already * Add intent key about missing camera permission * Add boolean value to show error dialog - always true for the beginning to keep current behaviour * Make displaying an error dialog for missing camera permissions optional * Add intent extras for Intent initialisation * Initialise camera permission dialog visibility from Intent * Add original intent to IntentResult * Use original intent in IntentResult * Make onRequestPermissionResult public again * Forward onRequestPermissionResult * React on Intent information - for example on the missing camera permission * Revert "Remove SDK version check since we are on minimum 24 already" This reverts commit 8f79f56a * Add missing imports
2020-01-07Merge pull request #511 from hannesa2/AndroidStudio-3.5.2Ralf Kistner4-12/+5
Android Studio 3.5.2
2020-01-07Merge pull request #527 from yands11/masterRalf Kistner17-57/+57
Apply space convention after 'if'