* app/src/main/java/io/lbry/browser/ui/wallet/WalletFragment.java:
Changed orientation of QR scanner, along with some style corrections
This commit is contained in:
parent
6e3e16e647
commit
519c45ae0d
3 changed files with 13 additions and 9 deletions
|
@ -122,6 +122,9 @@ 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'
|
||||||
|
@ -134,9 +137,6 @@ 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'
|
||||||
|
|
|
@ -101,6 +101,11 @@
|
||||||
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">
|
||||||
|
|
|
@ -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).initiateScan();
|
IntentIntegrator.forSupportFragment(WalletFragment.this).setOrientationLocked(false).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,5 +820,4 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
|
||||||
inputSendAddress.setText(code);
|
inputSendAddress.setText(code);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
Reference in a new issue