From 7049e491b7e8c9b8572db4ed8f17219ae5626dbc Mon Sep 17 00:00:00 2001 From: mint-chime Date: Fri, 18 Jun 2021 23:04:57 -0500 Subject: [PATCH] Fixed orientation of QR scanner activity, plus style corrections --- app/build.gradle | 8 ++++---- app/src/main/AndroidManifest.xml | 7 ++++++- .../java/io/lbry/browser/ui/wallet/WalletFragment.java | 10 +++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6870adc5..e6a86c76 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -122,6 +122,9 @@ dependencies { implementation 'org.bitcoinj:bitcoinj-tools:0.14.7' implementation 'org.java-websocket:Java-WebSocket:1.5.1' + implementation ('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } + implementation 'com.google.zxing:core:3.3.0' + compileOnly 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' @@ -134,10 +137,7 @@ dependencies { __32bitImplementation 'io.lbry:lbrysdk32:0.94.1' __64bitImplementation 'io.lbry:lbrysdk64:0.94.1' - - implementation ('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } - implementation 'com.google.zxing:core:3.3.0' } apply plugin: 'com.google.gms.google-services' -GoogleServicesPlugin.config.disableVersionCheck = true \ No newline at end of file +GoogleServicesPlugin.config.disableVersionCheck = true diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index da4b5252..3f958fdd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -101,6 +101,11 @@ android:theme="@style/AppTheme.NoActionBarTranslucent" android:windowSoftInputMode="adjustResize" /> + + @@ -119,4 +124,4 @@ android:resource="@xml/filepaths" /> - + \ No newline at end of file diff --git a/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java b/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java index bcb07f14..af8cf93e 100644 --- a/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java +++ b/app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java @@ -377,7 +377,8 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W buttonQRScanAddress.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - IntentIntegrator.forSupportFragment(WalletFragment.this).initiateScan(); + IntentIntegrator intentIntegrator = IntentIntegrator.forSupportFragment(WalletFragment.this); + intentIntegrator.setOrientationLocked(false).initiateScan(); } }); buttonSend.setOnClickListener(new View.OnClickListener() { @@ -727,8 +728,8 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W } else { firstDatasetNotification = false; if (!detailRows.get(0).detailAmount.equals(earnedBalance.detailAmount) - || detailRows.get(0).isInProgress != earnedBalance.isInProgress - || detailRows.get(0).isUnlockable != earnedBalance.isUnlockable) { + || detailRows.get(0).isInProgress != earnedBalance.isInProgress + || detailRows.get(0).isUnlockable != earnedBalance.isUnlockable) { detailRows.set(0, earnedBalance); needNotifyAdapter = true; } @@ -820,5 +821,4 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W inputSendAddress.setText(code); } } - -} \ No newline at end of file +}