From be451a19307c7b8e9b709292ba619ec0dbe2a9bf Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Thu, 20 Sep 2018 10:36:30 -0500 Subject: [PATCH 1/2] Solve issue related to Add Contact button appearing on the Merchants section. --- .../activities/BoardActivity.java | 97 ++++++++++--------- 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java index 23a3eb9..815e70f 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java +++ b/app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java @@ -120,50 +120,50 @@ public class BoardActivity extends CustomActivity { * Listener tabLayout to resalt text when clicked * */ final TabLayout tabLayoutFinal = tabLayout; - tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { - @Override - public void onTabSelected(final TabLayout.Tab tab) { - - globalActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - - LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition()); - tabLayout.setBackgroundColor(Color.TRANSPARENT); - TextView tabTextView = (TextView) tabLayout.getChildAt(1); - //tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50); - Spannable WordtoSpan = new SpannableString(tabTextView.getText()); - WordtoSpan.setSpan(new ForegroundColorSpan(Color.WHITE), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - tabTextView.setText(WordtoSpan); - tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.BOLD); - } - }); - } - - @Override - public void onTabUnselected(final TabLayout.Tab tab) { - - globalActivity.runOnUiThread(new Runnable() { - @Override - public void run() { - - LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition()); - TextView tabTextView = (TextView) tabLayout.getChildAt(1); - //tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50); - Spannable WordtoSpan = new SpannableString(tabTextView.getText()); - WordtoSpan.setSpan(new ForegroundColorSpan(globalActivity.getResources().getColor(R.color.lightGrayClear)), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - tabTextView.setText(WordtoSpan); - tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.NORMAL); - } - }); - } - - @Override - public void onTabReselected(TabLayout.Tab tab) { - - - } - }); +// tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { +// @Override +// public void onTabSelected(final TabLayout.Tab tab) { +// +// globalActivity.runOnUiThread(new Runnable() { +// @Override +// public void run() { +// +// LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition()); +// tabLayout.setBackgroundColor(Color.TRANSPARENT); +// TextView tabTextView = (TextView) tabLayout.getChildAt(1); +// //tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50); +// Spannable WordtoSpan = new SpannableString(tabTextView.getText()); +// WordtoSpan.setSpan(new ForegroundColorSpan(Color.WHITE), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); +// tabTextView.setText(WordtoSpan); +// tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.BOLD); +// } +// }); +// } +// +// @Override +// public void onTabUnselected(final TabLayout.Tab tab) { +// +// globalActivity.runOnUiThread(new Runnable() { +// @Override +// public void run() { +// +// LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition()); +// TextView tabTextView = (TextView) tabLayout.getChildAt(1); +// //tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50); +// Spannable WordtoSpan = new SpannableString(tabTextView.getText()); +// WordtoSpan.setSpan(new ForegroundColorSpan(globalActivity.getResources().getColor(R.color.lightGrayClear)), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); +// tabTextView.setText(WordtoSpan); +// tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.NORMAL); +// } +// }); +// } +// +// @Override +// public void onTabReselected(TabLayout.Tab tab) { +// +// +// } +// }); // Appbar animation mSurfaceView.getHolder().addCallback(new SurfaceHolder.Callback() { @@ -234,12 +234,19 @@ public class BoardActivity extends CustomActivity { .setInterpolator(new LinearInterpolator()).start(); break; - default: + case 2: fabReceive.hide(); fabSend.hide(); fabAddContact.animate().translationY(0) .setInterpolator(new LinearInterpolator()).start(); break; + + default: + fabReceive.hide(); + fabSend.hide(); + fabAddContact.animate().translationY(fabDistanceToHide) + .setInterpolator(new LinearInterpolator()).start(); + break; } } From be0fafd0e2633b50cff813afd0426229b6e10226 Mon Sep 17 00:00:00 2001 From: Henry Varona Date: Thu, 20 Sep 2018 20:59:25 -0400 Subject: [PATCH 2/2] Fallback faucet server --- .../crystalwallet/apigenerator/BitsharesFaucetApiGenerator.java | 2 +- .../crystalwallet/application/constant/BitsharesConstant.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7ce7f5e..5b2b6d2 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("/api/v1/accounts") + @POST("/faucet/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 6783404..0b807fa 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://faucet.palmpay.io"; + public final static String FAUCET_URL = "https://de.palmpay.io"; public final static String EQUIVALENT_URL = "wss://bitshares.openledger.info/ws"; public final static BitsharesAsset[] SMARTCOINS = new BitsharesAsset[]{