downgrade zxing:core for minSdkVersion 21

pull/343/head
andrekir 2022-01-10 00:33:26 -03:00
rodzic 58136c9cf4
commit e8e389930e
3 zmienionych plików z 4 dodań i 6 usunięć

Wyświetl plik

@ -186,9 +186,9 @@ dependencies {
// https://firebase.google.com/docs/android/setup#available-libraries // https://firebase.google.com/docs/android/setup#available-libraries
// barcode support // barcode support
// per https://github.com/journeyapps/zxing-android-embedded for support of android version 22 // per https://github.com/journeyapps/zxing-android-embedded#older-sdk-versions for minSdkVersion 21
implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } implementation('com.journeyapps:zxing-android-embedded:4.3.0') { transitive = false }
implementation 'com.google.zxing:core:3.4.1' implementation 'com.google.zxing:core:3.3.0' // <-- don't update
def work_version = '2.7.1' def work_version = '2.7.1'

Wyświetl plik

@ -12,9 +12,6 @@
android:name="android.hardware.location.gps" android:name="android.hardware.location.gps"
android:required="false" /> android:required="false" />
<!-- per https://github.com/journeyapps/zxing-android-embedded to force support for build 22 -->
<uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

Wyświetl plik

@ -211,6 +211,7 @@ class ChannelFragment : ScreenFragment("Channel"), Logging {
binding.scanButton.setOnClickListener { binding.scanButton.setOnClickListener {
if ((requireActivity() as MainActivity).hasCameraPermission()) { if ((requireActivity() as MainActivity).hasCameraPermission()) {
debug("Starting QR code scanner")
val zxingScan = IntentIntegrator.forSupportFragment(this) val zxingScan = IntentIntegrator.forSupportFragment(this)
zxingScan.setCameraId(0) zxingScan.setCameraId(0)
zxingScan.setPrompt("") zxingScan.setPrompt("")