From 493b00c4f8007192ddfc9331b13629789117b2fc Mon Sep 17 00:00:00 2001 From: Henry Varona Date: Sun, 7 Oct 2018 20:37:45 -0400 Subject: [PATCH 1/3] version and faucet changes --- app/build.gradle | 4 ++-- .../apigenerator/BitsharesFaucetApiGenerator.java | 2 +- .../crystalwallet/application/constant/BitsharesConstant.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 29eb088..44270e6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "cy.agorise.crystalwallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 2 - versionName "0.2M.alpha" + versionCode 4 + versionName "0.4M.alpha" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary true diff --git a/app/src/main/java/cy/agorise/crystalwallet/apigenerator/BitsharesFaucetApiGenerator.java b/app/src/main/java/cy/agorise/crystalwallet/apigenerator/BitsharesFaucetApiGenerator.java index 5b2b6d2..7ce7f5e 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/apigenerator/BitsharesFaucetApiGenerator.java +++ b/app/src/main/java/cy/agorise/crystalwallet/apigenerator/BitsharesFaucetApiGenerator.java @@ -219,7 +219,7 @@ public abstract class BitsharesFaucetApiGenerator { public interface IWebService { @Headers({"Content-Type: application/json"}) - @POST("/faucet/api/v1/accounts") + @POST("/api/v1/accounts") Call getReg(@Body Map params); } diff --git a/app/src/main/java/cy/agorise/crystalwallet/application/constant/BitsharesConstant.java b/app/src/main/java/cy/agorise/crystalwallet/application/constant/BitsharesConstant.java index 0b807fa..6783404 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/application/constant/BitsharesConstant.java +++ b/app/src/main/java/cy/agorise/crystalwallet/application/constant/BitsharesConstant.java @@ -32,7 +32,7 @@ public abstract class BitsharesConstant { //testnet faucet //public final static String FAUCET_URL = "http://185.208.208.147:5010"; - public final static String FAUCET_URL = "https://de.palmpay.io"; + public final static String FAUCET_URL = "https://faucet.palmpay.io"; public final static String EQUIVALENT_URL = "wss://bitshares.openledger.info/ws"; public final static BitsharesAsset[] SMARTCOINS = new BitsharesAsset[]{ From f82b90e0ee636e913b6df0d7cb99dd826e3ab4a8 Mon Sep 17 00:00:00 2001 From: hvarona Date: Sun, 7 Oct 2018 23:20:59 -0400 Subject: [PATCH 2/3] change zxing properties --- .../crystalwallet/fragments/SendTransactionFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java index 56b6600..b46a739 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java @@ -660,7 +660,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat public void beginScanQrCode(){ //mScannerView = new ZXingScannerView(getContext()); mScannerView.setFormats(listOf(BarcodeFormat.QR_CODE)); - mScannerView.setAspectTolerance(0.5f); + mScannerView.setAspectTolerance(10f); mScannerView.setAutoFocus(true); mScannerView.setLaserColor(R.color.colorAccent); mScannerView.setMaskColor(R.color.colorAccent); From 37674839455e9be2b00513379d50f1dbdcce9ad2 Mon Sep 17 00:00:00 2001 From: Henry Varona Date: Mon, 8 Oct 2018 11:21:35 -0400 Subject: [PATCH 3/3] version and camera --- app/build.gradle | 4 ++-- .../crystalwallet/fragments/SendTransactionFragment.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f8fa21f..7d26414 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "cy.agorise.crystalwallet" minSdkVersion 21 targetSdkVersion 27 - versionCode 3 - versionName "0.3M.alpha" + versionCode 4 + versionName "0.4M.alpha" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables { useSupportLibrary true diff --git a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java index b46a739..d3adc84 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java +++ b/app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java @@ -660,7 +660,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat public void beginScanQrCode(){ //mScannerView = new ZXingScannerView(getContext()); mScannerView.setFormats(listOf(BarcodeFormat.QR_CODE)); - mScannerView.setAspectTolerance(10f); + mScannerView.setAspectTolerance(20f); mScannerView.setAutoFocus(true); mScannerView.setLaserColor(R.color.colorAccent); mScannerView.setMaskColor(R.color.colorAccent);