LBRYCommunity/lbry-android
1
0
Fork 0
Code Issues 155 Pull requests 6 Projects Releases 84 Packages Wiki Activity

Added QR scanner to wallet send card #1194

Merged
soup-jingle merged 4 commits from qr-scanner into master 2021-08-13 10:01:53 +02:00
Conversation 1 Commits 4 Files changed 9 +9 -13
3 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9357b35cf9 - Show all commits

6
app/build.gradle
View file

@ -122,9 +122,6 @@ dependencies {
implementation 'org.bitcoinj:bitcoinj-tools:0.14.7' implementation 'org.bitcoinj:bitcoinj-tools:0.14.7'
implementation 'org.java-websocket:Java-WebSocket:1.5.1' 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' compileOnly 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
@ -137,6 +134,9 @@ dependencies {
__32bitImplementation 'io.lbry:lbrysdk32:0.94.1' __32bitImplementation 'io.lbry:lbrysdk32:0.94.1'
__64bitImplementation 'io.lbry:lbrysdk64: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' apply plugin: 'com.google.gms.google-services'

7
app/src/main/AndroidManifest.xml
View file

@ -101,11 +101,6 @@
android:theme="@style/AppTheme.NoActionBarTranslucent" android:theme="@style/AppTheme.NoActionBarTranslucent"
android:windowSoftInputMode="adjustResize" /> android:windowSoftInputMode="adjustResize" />
<activity
android:name="com.journeyapps.barcodescanner.CaptureActivity"
android:screenOrientation="fullSensor"
tools:replace="screenOrientation" />
<service <service
android:name="io.lbry.browser.LbrynetMessagingService" android:name="io.lbry.browser.LbrynetMessagingService"
android:exported="false"> android:exported="false">
@ -124,4 +119,4 @@
android:resource="@xml/filepaths" /> android:resource="@xml/filepaths" />
</provider> </provider>
</application> </application>
</manifest> </manifest>

9
app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java
View file

@ -377,7 +377,7 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
buttonQRScanAddress.setOnClickListener(new View.OnClickListener() { buttonQRScanAddress.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
IntentIntegrator.forSupportFragment(WalletFragment.this).setOrientationLocked(false).initiateScan(); IntentIntegrator.forSupportFragment(WalletFragment.this).initiateScan();
} }
}); });
buttonSend.setOnClickListener(new View.OnClickListener() { buttonSend.setOnClickListener(new View.OnClickListener() {
@ -727,8 +727,8 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
} else { } else {
firstDatasetNotification = false; firstDatasetNotification = false;
if (!detailRows.get(0).detailAmount.equals(earnedBalance.detailAmount) if (!detailRows.get(0).detailAmount.equals(earnedBalance.detailAmount)
|| detailRows.get(0).isInProgress != earnedBalance.isInProgress || detailRows.get(0).isInProgress != earnedBalance.isInProgress
|| detailRows.get(0).isUnlockable != earnedBalance.isUnlockable) { || detailRows.get(0).isUnlockable != earnedBalance.isUnlockable) {
detailRows.set(0, earnedBalance); detailRows.set(0, earnedBalance);
needNotifyAdapter = true; needNotifyAdapter = true;
} }
@ -820,4 +820,5 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
inputSendAddress.setText(code); inputSendAddress.setText(code);
} }
} }
}
}