github-jwinterm/LightWallet2
1
0
Fork 0
mirror of https://github.com/jwinterm/LightWallet2.git synced 2026-10-17 05:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change lockedbalance to just balance.

Browse Source
This commit is contained in:
jwinterm
2016-04-28 20:27:51 -07:00
parent 006d47107b
commit 1ecb52690b
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/com/jw/lightwallet/screens/MainScreen.java
+3 -3
View File
@@ -212,13 +212,13 @@ public class MainScreen extends AbstractScreen {
if (fivesectimer == true) {
// Timer task to check balance from simplewallet
balancerpc.getinfo(balancevalues);
walletview.lockedvalue.setText(df.format(balancevalues.getLockedbalance()/1e12) + " XMR");
walletview.balancevalue.setText(df.format(balancevalues.getBalance()/1e12) + " XMR");
walletview.unlockedvalue.setText(df.format(balancevalues.getUnlockedbalance()/1e12) + " XMR");
if (balancevalues.isChecked()) {
walletview.lockedvalue.setStyle(game.uiSkin.get("greenlabel", LabelStyle.class));
walletview.balancevalue.setStyle(game.uiSkin.get("greenlabel", LabelStyle.class));
walletview.unlockedvalue.setStyle(game.uiSkin.get("greenlabel", LabelStyle.class));
} else {
walletview.lockedvalue.setStyle(game.uiSkin.get("redlabel", LabelStyle.class));
walletview.balancevalue.setStyle(game.uiSkin.get("redlabel", LabelStyle.class));
walletview.unlockedvalue.setStyle(game.uiSkin.get("redlabel", LabelStyle.class));
}
fivesectimer = false;
core/src/com/jw/lightwallet/screens/WalletView.java
+6 -6
View File
@@ -23,8 +23,8 @@ public class WalletView {
Label syncvalue;
Label unlockedlabel;
Label unlockedvalue;
Label lockedlabel;
Label lockedvalue;
Label balancelabel;
Label balancevalue;
Label calcedlabel;
Label calcedvalue;
TextButton savewalletbtn;
@@ -61,10 +61,10 @@ public class WalletView {
walletlayout.add(unlockedlabel).pad(padvalue);
walletlayout.add(unlockedvalue).pad(padvalue).row();
lockedlabel = new Label("Locked balance: ", game.uiSkin);
lockedvalue = new Label("Loading...", game.uiSkin, "redlabel");
walletlayout.add(lockedlabel).pad(padvalue);
walletlayout.add(lockedvalue).pad(padvalue).row();
balancelabel = new Label("Balance: ", game.uiSkin);
balancevalue = new Label("Loading...", game.uiSkin, "redlabel");
walletlayout.add(balancelabel).pad(padvalue);
walletlayout.add(balancevalue).pad(padvalue).row();
calcedlabel = new Label("Calculated balance: ", game.uiSkin);
calcedvalue = new Label("None", game.uiSkin);
core/src/com/jw/lightwallet/utils/BalanceValues.java
+5 -5
View File
@@ -3,7 +3,7 @@ package com.jw.lightwallet.utils;
public class BalanceValues {
long unlockedbalance;
long lockedbalance;
long balance;
boolean checked;
public boolean isChecked() {
@@ -18,11 +18,11 @@ public class BalanceValues {
public void setUnlockedbalance(long unlockedbalance) {
this.unlockedbalance = unlockedbalance;
}
public Long getLockedbalance() {
return lockedbalance;
public Long getBalance() {
return balance;
}
public void setLockedbalance(long lockedbalance) {
this.lockedbalance = lockedbalance;
public void setBalance(long balance) {
this.balance = balance;
}
}
core/src/com/jw/lightwallet/wallet/BalanceRPC.java
+1 -1
View File
@@ -28,7 +28,7 @@ public class BalanceRPC {
public void handleHttpResponse(HttpResponse httpResponse) {
response = httpResponse.getResultAsString();
BalanceResponse balanceresponse = new Gson().fromJson(response, BalanceResponse.class);
balancevalues.setLockedbalance(balanceresponse.getResult().getLockedbalance());
balancevalues.setBalance(balanceresponse.getResult().getBalance());
balancevalues.setUnlockedbalance(balanceresponse.getResult().getUnlockedbalance());
balancevalues.setChecked(true);
}
core/src/com/jw/lightwallet/wallet/BalanceResult.java
+2 -2
View File
@@ -11,10 +11,10 @@ public class BalanceResult {
public void setUnlockedbalance(long unlocked_balance) {
this.unlocked_balance = unlocked_balance;
}
public long getLockedbalance() {
public long getBalance() {
return balance;
}
public void setLockedbalance(long balance) {
public void setBalance(long balance) {
this.balance = balance;
}