summaryrefslogtreecommitdiff
path: root/sample
AgeCommit message (Collapse)AuthorFilesLines
2021-10-25Ignore lint error.Ralf Kistner1-0/+8
2021-10-25Cleanup.Ralf Kistner1-21/+2
2021-10-25ScanOptions and ScanContract.Ralf Kistner3-99/+73
2021-10-25minSdkVersion 19. Multidex and desugaring.Ralf Kistner2-10/+12
2021-02-12Move CameraConfigurationUtils to prevent clash with ↵Christian Kollmann1-2/+2
com.google.zxing:android-core
2020-02-11Merge branch 'master' of github.com:journeyapps/zxing-android-embeddedRalf Kistner1-1/+0
2020-01-07Android Studio 3.5.3Hannes Achleitner1-1/+0
2020-01-07Release 4.1.0v4.1.0Ralf Kistner1-2/+2
2020-01-07Camera permission behaviour (#505)Andre Ippisch2-2/+16
* 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 Kistner1-4/+3
Android Studio 3.5.2
2019-11-17some code cleanupHannes Achleitner5-19/+12
2019-11-17Android Studio 3.5.2Hannes Achleitner1-4/+3
2019-10-17Let visibility of "laser scanner" be set (#503)Andre Ippisch2-0/+6
* Add laser visibility attribute * Add laser visibility attribute usage to sample project - set to true to stick with the current behavior - included for didactic reasons * Add laser visibility attribute to ViewfinderView and set it accordingly * Draw "laser scanner" only if wanted * Let laser visibility be changed programmatically * Add sample code to show how laser visibility can be changed programmatically
2019-09-07v4.0.2.v4.0.2Ralf Kistner1-2/+2
2019-09-07More publishing fixes.Ralf Kistner1-1/+1
2019-09-07v4.0.1v4.0.1Ralf Kistner1-2/+2
2019-09-07v4.0.0.; update docs.v4.0.0Ralf Kistner1-2/+2
2019-09-07Upgrade zxing; min sdk of 24.Ralf Kistner1-1/+1
2019-09-07More tooling upgrades.Ralf Kistner1-3/+8
2018-11-02Switch to androidx.Ralf Kistner6-21/+22
2018-11-02Add AboutLibaries to the sample app.Ralf Kistner4-0/+18
2018-11-02Merge branch 'master' of github.com:journeyapps/zxing-android-embeddedRalf Kistner1-0/+1
2018-11-02Remove redundant call; set random color on every launch in sample.Ralf Kistner1-1/+3
2018-11-02Merge branch 'change-mask-color-programmatically' of ↵Ralf Kistner1-0/+13
https://github.com/amadeu01/zxing-android-embedded into amadeu01-change-mask-color-programmatically
2018-11-02Merge pull request #383 from CaramelHeaven/feature/update_sampleRalf Kistner1-0/+1
Updated sample
2018-11-02More updates and fixes.Ralf Kistner3-4/+0
2018-10-16Added support for programmatically change ViewfinderView mask colorAmadeu Cavalcante1-0/+13
2018-05-30Gradle Update and SDK 27Wesley Crick1-5/+5
Updated android support dependencies to 27.1.1. Update deprecated "compile" to "implementation".
2018-03-30Updated sampleCaramelHeaven1-0/+1
2018-03-04zxing:core 3.3.2; notes on downgrading; bump to 3.6.0.Ralf Kistner1-2/+2
2018-03-04Make it easier to specify barcode formats.Ralf Kistner3-0/+24
2018-03-04Cleanup.Ralf Kistner1-0/+6
2018-03-04Merge pull request #327 from alpbak/masterRalf Kistner1-1/+7
Added a mixed scan mode to scan inverted and normal barcodes at the same time.
2018-03-04Make requestCode non-static.Ralf Kistner1-16/+14
2018-03-04Merge branch 'master' of github.com:journeyapps/zxing-android-embeddedRalf Kistner3-0/+25
2018-03-04Update build tools.Ralf Kistner1-4/+4
2018-03-04Fix some lint issues.Ralf Kistner1-1/+1
2017-09-15Revert "Added a mixed scan mode to enable scanning inverted and normal barcodes"alpbak1-3/+0
This reverts commit cf4c0dce50e56de1ac17869182621af50c009cac. # Conflicts: # sample/src/main/java/example/zxing/MainActivity.java # zxing-android-embedded/src/com/google/zxing/client/android/Intents.java # zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoratedBarcodeView.java # zxing-android-embedded/src/com/journeyapps/barcodescanner/DefaultDecoderFactory.java
2017-09-15Revert "Added a mixed scan mode to enable scanning inverted and normal barcodes"alpbak2-7/+3
This reverts commit cf4c0dce50e56de1ac17869182621af50c009cac.
2017-09-15Added a mixed scan mode to enable scanning inverted and normal barcodesalpbak1-2/+2
2017-09-14Added a mixed scan mode to enable scanning inverted and normal barcodesalpbak2-0/+13
2017-04-01Redefine the default activity request code for using switch statement.nlv3-0/+25
Add a construct function to set customized activity request code.
2017-03-20v3.5.0v3.5.0Ralf Kistner1-2/+2
2017-03-20Add tabbed scanner example.Ralf Kistner9-119/+171
2017-03-20Close camera before finishing Activity.Ralf Kistner6-0/+241
2017-03-12Squashed commit of the following:Ralf Kistner2-7/+16
commit 01acef10132802b22e104c411122c2790673afdc Author: Ralf Kistner <ralf@journeyapps.com> Date: Sun Mar 12 13:08:09 2017 +0200 Try again. commit 4c0605282d13df59c856fd64945d096d5789f227 Author: Ralf Kistner <ralf@journeyapps.com> Date: Sun Mar 12 13:01:58 2017 +0200 Show lint output on build failure. commit e9af0670c8b2e07a4bd2418042b0487e97fb9389 Author: Ralf Kistner <ralf@journeyapps.com> Date: Sun Mar 12 12:50:11 2017 +0200 Handle missing local.properties file. commit e3976102e7342d3008c7b88cb3f75397397e3d95 Author: Ralf Kistner <ralf@journeyapps.com> Date: Sun Mar 12 12:36:47 2017 +0200 Update SDK components installed on Travis. commit e50952cc89cc83720e146838debf6a22bb1d9c2a Author: Ralf Kistner <ralf@journeyapps.com> Date: Sun Mar 12 12:28:18 2017 +0200 More tool upgrades. * Gradle 3.4.1 * Android Gra dle plugin 2.3.0 * Remove android-sdk-manager (no longer required). * Ignore lint for translation issues in sample apps.
2017-01-14Dependencies updated. Most noteworthy: zxing:core 3.3.0Paul Woitaschek1-3/+3
2016-11-03Added support for inverted scans.Leighton, Michael2-0/+13
2016-10-16Bump sample app to 3.4.0.Ralf Kistner1-2/+2
2016-10-16Simplify BeepManager. Beep based on media volume only.Ralf Kistner1-2/+13
generated by cgit v1.2.3 (git 2.39.0) at 2026-02-09 10:03:23 +0300