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:
dtvv 2018-09-20 20:11:47 -05:00
commit 8e79f14205
3 changed files with 54 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
View file

@ -120,50 +120,50 @@ public class BoardActivity extends CustomActivity {
* Listener tabLayout to resalt text when clicked * Listener tabLayout to resalt text when clicked
* */ * */
final TabLayout tabLayoutFinal = tabLayout; final TabLayout tabLayoutFinal = tabLayout;
tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { // tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override // @Override
public void onTabSelected(final TabLayout.Tab tab) { // public void onTabSelected(final TabLayout.Tab tab) {
//
globalActivity.runOnUiThread(new Runnable() { // globalActivity.runOnUiThread(new Runnable() {
@Override // @Override
public void run() { // public void run() {
//
LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition()); // LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition());
tabLayout.setBackgroundColor(Color.TRANSPARENT); // tabLayout.setBackgroundColor(Color.TRANSPARENT);
TextView tabTextView = (TextView) tabLayout.getChildAt(1); // TextView tabTextView = (TextView) tabLayout.getChildAt(1);
//tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50); // //tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50);
Spannable WordtoSpan = new SpannableString(tabTextView.getText()); // Spannable WordtoSpan = new SpannableString(tabTextView.getText());
WordtoSpan.setSpan(new ForegroundColorSpan(Color.WHITE), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); // WordtoSpan.setSpan(new ForegroundColorSpan(Color.WHITE), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
tabTextView.setText(WordtoSpan); // tabTextView.setText(WordtoSpan);
tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.BOLD); // tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.BOLD);
} // }
}); // });
} // }
//
@Override // @Override
public void onTabUnselected(final TabLayout.Tab tab) { // public void onTabUnselected(final TabLayout.Tab tab) {
//
globalActivity.runOnUiThread(new Runnable() { // globalActivity.runOnUiThread(new Runnable() {
@Override // @Override
public void run() { // public void run() {
//
LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition()); // LinearLayout tabLayout = (LinearLayout)((ViewGroup) tabLayoutFinal.getChildAt(0)).getChildAt(tab.getPosition());
TextView tabTextView = (TextView) tabLayout.getChildAt(1); // TextView tabTextView = (TextView) tabLayout.getChildAt(1);
//tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50); // //tabTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP ,50);
Spannable WordtoSpan = new SpannableString(tabTextView.getText()); // Spannable WordtoSpan = new SpannableString(tabTextView.getText());
WordtoSpan.setSpan(new ForegroundColorSpan(globalActivity.getResources().getColor(R.color.lightGrayClear)), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); // WordtoSpan.setSpan(new ForegroundColorSpan(globalActivity.getResources().getColor(R.color.lightGrayClear)), 0, tabTextView.getText().length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
tabTextView.setText(WordtoSpan); // tabTextView.setText(WordtoSpan);
tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.NORMAL); // tabTextView.setTypeface(tabTextView.getTypeface(), Typeface.NORMAL);
} // }
}); // });
} // }
//
@Override // @Override
public void onTabReselected(TabLayout.Tab tab) { // public void onTabReselected(TabLayout.Tab tab) {
//
//
} // }
}); // });
// Appbar animation // Appbar animation
mSurfaceView.getHolder().addCallback(new SurfaceHolder.Callback() { mSurfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
@ -234,12 +234,19 @@ public class BoardActivity extends CustomActivity {
.setInterpolator(new LinearInterpolator()).start(); .setInterpolator(new LinearInterpolator()).start();
break; break;
default: case 2:
fabReceive.hide(); fabReceive.hide();
fabSend.hide(); fabSend.hide();
fabAddContact.animate().translationY(0) fabAddContact.animate().translationY(0)
.setInterpolator(new LinearInterpolator()).start(); .setInterpolator(new LinearInterpolator()).start();
break; break;
default:
fabReceive.hide();
fabSend.hide();
fabAddContact.animate().translationY(fabDistanceToHide)
.setInterpolator(new LinearInterpolator()).start();
break;
} }
} }

2
app/src/main/java/cy/agorise/crystalwallet/apigenerator/BitsharesFaucetApiGenerator.java
View file

@ -219,7 +219,7 @@ public abstract class BitsharesFaucetApiGenerator {
public interface IWebService { public interface IWebService {
@Headers({"Content-Type: application/json"}) @Headers({"Content-Type: application/json"})
@POST("/api/v1/accounts") @POST("/faucet/api/v1/accounts")
Call<RegisterAccountResponse> getReg(@Body Map<String, HashMap> params); Call<RegisterAccountResponse> getReg(@Body Map<String, HashMap> params);
} }

2
app/src/main/java/cy/agorise/crystalwallet/application/constant/BitsharesConstant.java
View file

@ -32,7 +32,7 @@ public abstract class BitsharesConstant {
//testnet faucet //testnet faucet
//public final static String FAUCET_URL = "http://185.208.208.147:5010"; //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 String EQUIVALENT_URL = "wss://bitshares.openledger.info/ws";
public final static BitsharesAsset[] SMARTCOINS = new BitsharesAsset[]{ public final static BitsharesAsset[] SMARTCOINS = new BitsharesAsset[]{