agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/Agorise/crystal-wallet-android into develop

Browse source
This commit is contained in:
Javier Varona 2018-10-10 21:58:06 -04:00
commit 4fee5de10b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -17,8 +17,8 @@ android {
applicationId "cy.agorise.crystalwallet" applicationId "cy.agorise.crystalwallet"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 27 targetSdkVersion 27
versionCode 3 versionCode 4
versionName "0.3M.alpha" versionName "0.4M.alpha"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
useSupportLibrary true useSupportLibrary true

2
app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java
View file

@ -660,7 +660,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
public void beginScanQrCode(){ public void beginScanQrCode(){
//mScannerView = new ZXingScannerView(getContext()); //mScannerView = new ZXingScannerView(getContext());
mScannerView.setFormats(listOf(BarcodeFormat.QR_CODE)); mScannerView.setFormats(listOf(BarcodeFormat.QR_CODE));
mScannerView.setAspectTolerance(0.5f); mScannerView.setAspectTolerance(20f);
mScannerView.setAutoFocus(true); mScannerView.setAutoFocus(true);
mScannerView.setLaserColor(R.color.colorAccent); mScannerView.setLaserColor(R.color.colorAccent);
mScannerView.setMaskColor(R.color.colorAccent); mScannerView.setMaskColor(R.color.colorAccent);