rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-09-19 08:40:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

0.4.7

Browse source 
Transaction screen redesign. Now auto-updates as well.
Tx builder fee calculation fixes (thanks to Monero C++ bug fixes).
Wallet balance now displays immediately once synced, fixing a recent bug where it was delayed by a few seconds.
This commit is contained in:
pokkst 2023-12-02 20:13:56 -06:00
parent eb8d0b0b46
commit bc004857ee
No known key found for this signature in database
GPG key ID: EC4FAAA66859FAA4
16 changed files with 269 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -9,8 +9,8 @@ android {
applicationId "net.mynero.wallet"
minSdkVersion 21
targetSdkVersion 34
versionCode 40600
versionName "0.4.6 'Fluorine Fermi'"
versionCode 40700
versionName "0.4.7 'Fluorine Fermi'"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {

6
app/src/main/java/net/mynero/wallet/MainActivity.java
View file

@ -108,8 +108,10 @@ public class MainActivity extends AppCompatActivity implements MoneroHandlerThre
}
@Override
public void onRefresh() {
this.utxoService.refreshUtxos();
public void onRefresh(boolean walletSynced) {
if(walletSynced)
this.utxoService.refreshUtxos();
this.historyService.refreshHistory();
this.balanceService.refreshBalance();
this.blockchainService.refreshBlockchain();

6
app/src/main/java/net/mynero/wallet/data/Node.java
View file

@ -351,13 +351,17 @@ public class Node {
}
public String getAddress() {
return getHost() + ":" + rpcPort;
return getHost() + ":" + getRpcPort();
}
public String getHost() {
return host;
}
public int getRpcPort() {
return rpcPort;
}
public void setHost(String host) throws UnknownHostException {
if ((host == null) || (host.isEmpty()))
throw new UnknownHostException("loopback not supported (yet?)");

11
app/src/main/java/net/mynero/wallet/fragment/dialog/AddNodeBottomSheetDialog.java
View file

@ -41,6 +41,7 @@ public class AddNodeBottomSheetDialog extends BottomSheetDialogFragment {
super.onViewCreated(view, savedInstanceState);
Button addNodeButton = view.findViewById(R.id.add_node_button);
EditText addressEditText = view.findViewById(R.id.address_edittext);
EditText portEditText = view.findViewById(R.id.node_port_edittext);
EditText nodeNameEditText = view.findViewById(R.id.node_name_edittext);
EditText usernameEditText = view.findViewById(R.id.username_edittext);
EditText passwordEditText = view.findViewById(R.id.password_edittext);
@ -67,14 +68,15 @@ public class AddNodeBottomSheetDialog extends BottomSheetDialogFragment {
addPasteListener(view, passwordEditText, R.id.paste_password_imagebutton);
addNodeButton.setOnClickListener(view1 -> {
String node = addressEditText.getText().toString();
String nodeAddr = addressEditText.getText().toString();
String portString = portEditText.getText().toString();
String name = nodeNameEditText.getText().toString();
String user = usernameEditText.getText().toString();
String pass = passwordEditText.getText().toString();
if(name.isEmpty()) {
Toast.makeText(getContext(), "Enter node name", Toast.LENGTH_SHORT).show();
return;
} else if(node.isEmpty()) {
} else if(nodeAddr.isEmpty() || portString.isEmpty()) {
Toast.makeText(getContext(), "Enter node address", Toast.LENGTH_SHORT).show();
return;
} else if(!user.isEmpty() && pass.isEmpty()) {
@ -88,10 +90,9 @@ public class AddNodeBottomSheetDialog extends BottomSheetDialogFragment {
jsonObject.put("username", user);
jsonObject.put("password", pass);
}
String[] nodeParts = node.split(":");
jsonObject.put("host", nodeParts[0]);
jsonObject.put("rpcPort", nodeParts[1]);
jsonObject.put("host", nodeAddr);
jsonObject.put("rpcPort", Integer.parseInt(portString));
jsonObject.put("network", "mainnet");
jsonObject.put("name", name);

5
app/src/main/java/net/mynero/wallet/fragment/dialog/EditNodeBottomSheetDialog.java
View file

@ -48,13 +48,16 @@ public class EditNodeBottomSheetDialog extends BottomSheetDialogFragment {
Button deleteNodeButton = view.findViewById(R.id.delete_node_button);
Button doneEditingButton = view.findViewById(R.id.done_editing_button);
EditText addressEditText = view.findViewById(R.id.address_edittext);
EditText portEditText = view.findViewById(R.id.node_port_edittext);
EditText nodeNameEditText = view.findViewById(R.id.node_name_edittext);
EditText usernameEditText = view.findViewById(R.id.username_edittext);
EditText passwordEditText = view.findViewById(R.id.password_edittext);
ImageButton pastePasswordImageButton = view.findViewById(R.id.paste_password_imagebutton);
Node node = Node.fromJson(nodeJson);
addressEditText.setText(node.getAddress());
if(node == null) return;
addressEditText.setText(node.getHost());
portEditText.setText(node.getRpcPort());
nodeNameEditText.setText(node.getName());
usernameEditText.setText(node.getUsername());
if(!node.getPassword().isEmpty()) {

2
app/src/main/java/net/mynero/wallet/fragment/home/HomeFragment.java
View file

@ -120,7 +120,7 @@ public class HomeFragment extends Fragment implements TransactionInfoAdapter.TxI
if (height > 1 && daemonHeight > 1) {
progressBar.setProgress(x);
progressBarText.setVisibility(View.VISIBLE);
progressBarText.setText("Syncing... " + height + " / " + daemonHeight);
progressBarText.setText("Syncing... " + n + " blocks remaining");
} else {
progressBarText.setVisibility(View.GONE);
}

8
app/src/main/java/net/mynero/wallet/fragment/send/SendFragment.java
View file

@ -434,21 +434,23 @@ public class SendFragment extends Fragment {
mViewModel.setPendingTransaction(pendingTx);
} else {
Activity activity = getActivity();
if (activity != null) {
if (activity != null && pendingTx != null) {
activity.runOnUiThread(() -> {
createButton.setEnabled(true);
sendMaxButton.setEnabled(true);
Toast.makeText(getActivity(), getString(R.string.error_creating_tx), Toast.LENGTH_SHORT).show();
if(pendingTx.getErrorString() != null)
Toast.makeText(activity, getString(R.string.error_creating_tx, pendingTx.getErrorString()), Toast.LENGTH_SHORT).show();
});
}
}
} catch (Exception e) {
e.printStackTrace();
Activity activity = getActivity();
if (activity != null) {
activity.runOnUiThread(() -> {
createButton.setEnabled(true);
sendMaxButton.setEnabled(true);
Toast.makeText(getActivity(), e.getMessage(), Toast.LENGTH_SHORT).show();
Toast.makeText(activity, getString(R.string.error_creating_tx, e.getMessage()), Toast.LENGTH_SHORT).show();
});
}
}

84
app/src/main/java/net/mynero/wallet/fragment/transaction/TransactionFragment.java
View file

@ -19,18 +19,22 @@ import androidx.lifecycle.ViewModelProvider;
import net.mynero.wallet.R;
import net.mynero.wallet.model.TransactionInfo;
import net.mynero.wallet.model.Wallet;
import net.mynero.wallet.model.WalletManager;
import net.mynero.wallet.service.HistoryService;
import net.mynero.wallet.service.PrefService;
import net.mynero.wallet.util.Constants;
import net.mynero.wallet.util.Helper;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.TimeZone;
public class TransactionFragment extends Fragment {
private TransactionViewModel mViewModel;
private TransactionInfo transactionInfo = null;
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@ -48,8 +52,7 @@ public class TransactionFragment extends Fragment {
mViewModel = new ViewModelProvider(this).get(TransactionViewModel.class);
Bundle args = getArguments();
if (args != null) {
TransactionInfo txInfo = getArguments().getParcelable(Constants.NAV_ARG_TXINFO);
mViewModel.init(txInfo);
this.transactionInfo = getArguments().getParcelable(Constants.NAV_ARG_TXINFO);
}
bindObservers(view);
@ -59,25 +62,26 @@ public class TransactionFragment extends Fragment {
private void bindListeners(View view) {
ImageButton copyTxHashImageButton = view.findViewById(R.id.copy_txhash_imagebutton);
copyTxHashImageButton.setOnClickListener(view1 -> {
TransactionInfo txInfo = mViewModel.transaction.getValue();
TransactionInfo txInfo = this.transactionInfo;
if (txInfo != null) {
Helper.clipBoardCopy(getContext(), "transaction_hash", txInfo.hash);
}
});
ImageButton copyTxAddressImageButton = view.findViewById(R.id.copy_txaddress_imagebutton);
TextView addressTextView = view.findViewById(R.id.transaction_address_textview);
copyTxAddressImageButton.setOnClickListener(view1 -> {
TransactionInfo txInfo = mViewModel.transaction.getValue();
TransactionInfo txInfo = this.transactionInfo;
if (txInfo != null) {
String destination = mViewModel.destination.getValue();
if (destination != null) {
Helper.clipBoardCopy(getContext(), "transaction_address", destination);
}
String destination = addressTextView.getText().toString();
Helper.clipBoardCopy(getContext(), "transaction_address", destination);
}
});
}
private void bindObservers(View view) {
TextView txActionTextView = view.findViewById(R.id.transaction_action_textview);
TextView confLabel2 = view.findViewById(R.id.transaction_conf_label2_textview);
TextView txHashTextView = view.findViewById(R.id.transaction_hash_textview);
TextView txConfTextView = view.findViewById(R.id.transaction_conf_textview);
TextView txAddressTextView = view.findViewById(R.id.transaction_address_textview);
@ -85,43 +89,73 @@ public class TransactionFragment extends Fragment {
TextView txDateTextView = view.findViewById(R.id.transaction_date_textview);
TextView txAmountTextView = view.findViewById(R.id.transaction_amount_textview);
TextView blockHeightTextView = view.findViewById(R.id.tx_block_height_textview);
TextView blockHeightLabelTextView = view.findViewById(R.id.transaction_block_height_label_textview);
mViewModel.transaction.observe(getViewLifecycleOwner(), transactionInfo -> {
txHashTextView.setText(transactionInfo.hash);
txConfTextView.setText("" + transactionInfo.confirmations);
txDateTextView.setText(getDateTime(transactionInfo.timestamp));
if(transactionInfo.confirmations > 0) {
blockHeightTextView.setText("" + transactionInfo.blockheight);
HistoryService.getInstance().history.observe(getViewLifecycleOwner(), transactionInfos -> {
TransactionInfo newTransactionInfo = findNewestVersionOfTransaction(this.transactionInfo, transactionInfos);
if(newTransactionInfo == null) return;
txHashTextView.setText(newTransactionInfo.hash);
txConfTextView.setText("" + newTransactionInfo.confirmations);
txDateTextView.setText(getDateTime(newTransactionInfo.timestamp));
if(newTransactionInfo.confirmations > 1) {
confLabel2.setText(getString(R.string.transaction_conf_desc2_confirmed));
blockHeightTextView.setText("" + newTransactionInfo.blockheight);
blockHeightTextView.setVisibility(View.VISIBLE);
} else if(newTransactionInfo.confirmations == 1) {
confLabel2.setText(getString(R.string.transaction_conf_1_desc2_confirmed));
blockHeightTextView.setText("" + newTransactionInfo.blockheight);
blockHeightTextView.setVisibility(View.VISIBLE);
blockHeightLabelTextView.setVisibility(View.VISIBLE);
} else {
blockHeightTextView.setVisibility(View.GONE);
blockHeightLabelTextView.setVisibility(View.GONE);
confLabel2.setText(getString(R.string.transaction_conf_desc2_unconfirmed));
}
Context ctx = getContext();
if(ctx != null) {
boolean streetModeEnabled = PrefService.getInstance().getBoolean(Constants.PREF_STREET_MODE, false);
String balanceString = streetModeEnabled ? Constants.STREET_MODE_BALANCE : Wallet.getDisplayAmount(transactionInfo.amount);
if (transactionInfo.direction == TransactionInfo.Direction.Direction_In) {
String balanceString = streetModeEnabled ? Constants.STREET_MODE_BALANCE : Helper.getDisplayAmount(newTransactionInfo.amount, 12);
if (newTransactionInfo.direction == TransactionInfo.Direction.Direction_In) {
txActionTextView.setText(getString(R.string.transaction_action_recv));
txAmountTextView.setTextColor(ContextCompat.getColor(ctx, R.color.oled_positiveColor));
txAmountTextView.setText(getString(R.string.tx_list_amount_positive, balanceString));
} else {
txActionTextView.setText(getString(R.string.transaction_action_sent));
txAmountTextView.setTextColor(ContextCompat.getColor(ctx, R.color.oled_negativeColor));
txAmountTextView.setText(getString(R.string.tx_list_amount_negative, balanceString));
}
txAmountTextView.setText(balanceString);
}
String destination = "-";
Wallet wallet = WalletManager.getInstance().getWallet();
if (newTransactionInfo.txKey == null) {
newTransactionInfo.txKey = wallet.getTxKey(newTransactionInfo.hash);
}
if (newTransactionInfo.address == null && newTransactionInfo.direction == TransactionInfo.Direction.Direction_In) {
destination = wallet.getSubaddress(newTransactionInfo.accountIndex, newTransactionInfo.addressIndex);
} else if (newTransactionInfo.address != null && newTransactionInfo.direction == TransactionInfo.Direction.Direction_In) {
destination = newTransactionInfo.address;
} else if (newTransactionInfo.transfers != null && newTransactionInfo.direction == TransactionInfo.Direction.Direction_Out) {
if (newTransactionInfo.transfers.size() == 1) {
destination = newTransactionInfo.transfers.get(0).address;
}
}
});
mViewModel.destination.observe(getViewLifecycleOwner(), s -> {
txAddressTextView.setText(Objects.requireNonNullElse(s, "-"));
if (s == null) {
txAddressTextView.setText(Objects.requireNonNullElse(destination, "-"));
if (destination == null) {
copyTxAddressImageButton.setVisibility(View.INVISIBLE);
}
});
}
private TransactionInfo findNewestVersionOfTransaction(TransactionInfo oldTransactionInfo, List<TransactionInfo> transactionInfoList) {
for(TransactionInfo transactionInfo : transactionInfoList) {
if(transactionInfo.hash.equals(oldTransactionInfo.hash)) {
this.transactionInfo = transactionInfo;
return this.transactionInfo;
}
}
return null;
}
private String getDateTime(long time) {
return DATETIME_FORMATTER.format(new Date(time * 1000));
}

21
app/src/main/java/net/mynero/wallet/fragment/transaction/TransactionViewModel.java
View file

@ -9,25 +9,4 @@ import net.mynero.wallet.model.Wallet;
import net.mynero.wallet.model.WalletManager;
public class TransactionViewModel extends ViewModel {
private final MutableLiveData<TransactionInfo> _transaction = new MutableLiveData<>(null);
private final MutableLiveData<String> _destination = new MutableLiveData<>(null);
public LiveData<TransactionInfo> transaction = _transaction;
public LiveData<String> destination = _destination;
public void init(TransactionInfo info) {
Wallet wallet = WalletManager.getInstance().getWallet();
if (info.txKey == null) {
info.txKey = wallet.getTxKey(info.hash);
}
if (info.address == null && info.direction == TransactionInfo.Direction.Direction_In) {
_destination.setValue(wallet.getSubaddress(info.accountIndex, info.addressIndex));
} else if (info.address != null && info.direction == TransactionInfo.Direction.Direction_In) {
_destination.setValue(info.address);
} else if (info.transfers != null && info.direction == TransactionInfo.Direction.Direction_Out) {
if (info.transfers.size() == 1) {
_destination.setValue(info.transfers.get(0).address);
}
}
this._transaction.setValue(info);
}
}

4
app/src/main/java/net/mynero/wallet/service/HistoryService.java
View file

@ -9,7 +9,7 @@ import net.mynero.wallet.model.WalletManager;
import java.util.List;
public class HistoryService extends ServiceBase {
public static HistoryService instance = null;
private static HistoryService instance = null;
private final MutableLiveData<List<TransactionInfo>> _history = new MutableLiveData<>();
public LiveData<List<TransactionInfo>> history = _history;
@ -26,7 +26,7 @@ public class HistoryService extends ServiceBase {
_history.postValue(getHistory());
}
public List<TransactionInfo> getHistory() {
private List<TransactionInfo> getHistory() {
return WalletManager.getInstance().getWallet().getHistory().getAll();
}
}

14
app/src/main/java/net/mynero/wallet/service/MoneroHandlerThread.java
View file

@ -17,9 +17,7 @@
package net.mynero.wallet.service;
import net.mynero.wallet.data.DefaultNodes;
import net.mynero.wallet.data.Node;
import net.mynero.wallet.data.TxData;
import net.mynero.wallet.model.CoinsInfo;
import net.mynero.wallet.model.PendingTransaction;
import net.mynero.wallet.model.TransactionOutput;
@ -57,7 +55,7 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
@Override
public synchronized void start() {
super.start();
this.listener.onRefresh();
this.listener.onRefresh(false);
}
@Override
@ -120,12 +118,12 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
BlockchainService.getInstance().setConnectionStatus(status);
}
private void refresh(boolean refreshCoins) {
private void refresh(boolean walletSynced) {
wallet.refreshHistory();
if(refreshCoins) {
if(walletSynced) {
wallet.refreshCoins();
}
listener.onRefresh();
listener.onRefresh(walletSynced);
}
public PendingTransaction createTx(String address, String amountStr, boolean sendAll, PendingTransaction.Priority feePriority, ArrayList<String> selectedUtxos) throws Exception {
@ -146,7 +144,7 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
ArrayList<String> preferredInputs;
if (selectedUtxos.isEmpty()) {
// no inputs manually selected, we are sending from home screen most likely, or user somehow broke the app
preferredInputs = UTXOService.getInstance().selectUtxos(totalAmount, sendAll);
preferredInputs = UTXOService.getInstance().selectUtxos(totalAmount, sendAll, feePriority);
} else {
preferredInputs = selectedUtxos;
checkSelectedAmounts(preferredInputs, totalAmount, sendAll);
@ -233,7 +231,7 @@ public class MoneroHandlerThread extends Thread implements WalletListener {
}
public interface Listener {
void onRefresh();
void onRefresh(boolean walletSynced);
void onConnectionFail();
}
}

20
app/src/main/java/net/mynero/wallet/service/UTXOService.java
View file

@ -5,7 +5,6 @@ import android.util.Pair;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import net.mynero.wallet.model.Coins;
import net.mynero.wallet.model.CoinsInfo;
import net.mynero.wallet.model.PendingTransaction;
import net.mynero.wallet.model.Wallet;
@ -22,6 +21,7 @@ import java.util.List;
public class UTXOService extends ServiceBase {
public static UTXOService instance = null;
private List<CoinsInfo> internalCachedUtxos = new ArrayList<>();
private final MutableLiveData<List<CoinsInfo>> _utxos = new MutableLiveData<>();
public LiveData<List<CoinsInfo>> utxos = _utxos;
private ArrayList<String> frozenCoins = new ArrayList<>();
@ -41,12 +41,13 @@ public class UTXOService extends ServiceBase {
}
public void refreshUtxos() {
_utxos.postValue(getUtxosInternal());
List<CoinsInfo> coinsInfos = getUtxosInternal();
_utxos.postValue(coinsInfos);
internalCachedUtxos = coinsInfos;
}
public List<CoinsInfo> getUtxos() {
List<CoinsInfo> value = utxos.getValue();
return value != null ? value : List.of();
return Collections.unmodifiableList(internalCachedUtxos);
}
private List<CoinsInfo> getUtxosInternal() {
@ -93,12 +94,12 @@ public class UTXOService extends ServiceBase {
prefService.edit().putString(Constants.PREF_FROZEN_COINS, jsonArray.toString()).apply();
}
public ArrayList<String> selectUtxos(long amount, boolean sendAll) throws Exception {
final long basicFeeEstimate = calculateBasicFee(amount);
public ArrayList<String> selectUtxos(long amount, boolean sendAll, PendingTransaction.Priority feePriority) throws Exception {
final long basicFeeEstimate = calculateBasicFee(amount, feePriority);
final long amountWithBasicFee = amount + basicFeeEstimate;
ArrayList<String> selectedUtxos = new ArrayList<>();
ArrayList<String> seenTxs = new ArrayList<>();
List<CoinsInfo> utxos = getUtxos();
List<CoinsInfo> utxos = new ArrayList<>(getUtxos());
long amountSelected = 0;
Collections.sort(utxos);
//loop through each utxo
@ -127,11 +128,10 @@ public class UTXOService extends ServiceBase {
return selectedUtxos;
}
private long calculateBasicFee(long amount) {
private long calculateBasicFee(long amount, PendingTransaction.Priority feePriority) {
ArrayList<Pair<String, Long>> destinations = new ArrayList<>();
destinations.add(new Pair<>("87MRtZPrWUCVUgcFHdsVb5MoZUcLtqfD3FvQVGwftFb8eSdMnE39JhAJcbuSW8X2vRaRsB9RQfuCpFciybJFHaz3QYPhCLw", amount));
// destination string doesn't actually matter here, so i'm using the donation address. amount also technically doesn't matter
// priority also isn't accounted for in the Monero C++ code. maybe this is a bug by the core Monero team, or i'm using an outdated method.
return WalletManager.getInstance().getWallet().estimateTransactionFee(destinations, PendingTransaction.Priority.Priority_Low);
return WalletManager.getInstance().getWallet().estimateTransactionFee(destinations, feePriority);
}
}

25
app/src/main/res/layout/add_node_bottom_sheet_dialog.xml
View file

@ -45,15 +45,13 @@
android:id="@+id/paste_address_imagebutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/address_edittext"
app:layout_constraintStart_toEndOf="@id/node_port_edittext"
app:layout_constraintTop_toTopOf="@id/address_edittext"
tools:ignore="SpeakableTextPresentCheck" />
@ -61,16 +59,30 @@
android:id="@+id/address_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:background="@drawable/edittext_bg"
android:hint="@string/node_address_hint"
android:inputType="text"
android:digits="-QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890.:"
app:layout_constraintBottom_toTopOf="@id/username_edittext"
app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
app:layout_constraintEnd_toStartOf="@id/node_port_edittext"
app:layout_constraintStart_toStartOf="parent" />
<EditText
android:id="@+id/node_port_edittext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:background="@drawable/edittext_bg"
android:hint="@string/node_port_hint"
android:inputType="number"
android:digits="-QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890.:"
app:layout_constraintTop_toTopOf="@id/address_edittext"
app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
app:layout_constraintStart_toEndOf="@id/address_edittext" />
<Button
android:id="@+id/add_node_button"
android:layout_width="match_parent"
@ -85,7 +97,6 @@
android:id="@+id/username_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:background="@drawable/edittext_bg"
android:hint="@string/node_username_hint"
@ -98,8 +109,6 @@
android:id="@+id/paste_username_imagebutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"

30
app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml
View file

@ -45,15 +45,13 @@
android:id="@+id/paste_address_imagebutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/address_edittext"
app:layout_constraintStart_toEndOf="@id/node_port_edittext"
app:layout_constraintTop_toTopOf="@id/address_edittext"
tools:ignore="SpeakableTextPresentCheck" />
@ -61,20 +59,34 @@
android:id="@+id/address_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:background="@drawable/edittext_bg"
android:hint="@string/node_address_hint"
android:inputType="text"
android:digits="-QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890.:"
app:layout_constraintBottom_toTopOf="@id/username_edittext"
app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
app:layout_constraintEnd_toStartOf="@id/node_port_edittext"
app:layout_constraintStart_toStartOf="parent" />
<EditText
android:id="@+id/node_port_edittext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:background="@drawable/edittext_bg"
android:hint="@string/node_port_hint"
android:inputType="number"
android:digits="-QWERTYUIOPASDFGHJKLZXCVBNMqwertyuiopasdfghjklzxcvbnm1234567890.:"
app:layout_constraintTop_toTopOf="@id/address_edittext"
app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
app:layout_constraintStart_toEndOf="@id/address_edittext" />
<EditText
android:id="@+id/username_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="16dp"
android:background="@drawable/edittext_bg"
android:hint="@string/node_username_hint"
@ -87,8 +99,6 @@
android:id="@+id/paste_username_imagebutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
@ -136,7 +146,7 @@
android:id="@+id/delete_node_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="1dp"
android:background="@drawable/button_bg_left"
android:text="@string/delete"
@ -147,7 +157,7 @@
android:id="@+id/done_editing_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="32dp"
android:layout_marginStart="1dp"
android:background="@drawable/button_bg_right"
android:text="@string/done"

232
app/src/main/res/layout/fragment_transaction.xml
View file

@ -8,143 +8,54 @@
tools:context="net.mynero.wallet.fragment.settings.SettingsFragment">
<TextView
android:id="@+id/transaction_title_textview"
android:id="@+id/transaction_action_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/transaction"
android:textSize="32sp"
android:text="@string/transaction_action_recv"
android:textSize="42sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/transaction_hash_label_textview"
android:textColor="@color/oled_addressListColor"
app:layout_constraintBottom_toTopOf="@id/transaction_amount_textview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/transaction_hash_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/transaction_hash"
android:textSize="18sp"
android:layout_marginTop="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_title_textview"/>
<TextView
android:id="@+id/transaction_hash_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/transaction_hash"
android:textSize="14sp"
android:layout_marginTop="8dp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/copy_txhash_imagebutton"
app:layout_constraintTop_toTopOf="@id/copy_txhash_imagebutton"
app:layout_constraintBottom_toBottomOf="@id/copy_txhash_imagebutton"/>
<ImageButton
android:id="@+id/copy_txhash_imagebutton"
android:id="@+id/transaction_amount_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/transaction_hash_textview"
app:layout_constraintTop_toBottomOf="@id/transaction_hash_label_textview" />
<TextView
android:id="@+id/transaction_conf_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/confirmations"
android:textSize="18sp"
android:layout_marginTop="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/copy_txhash_imagebutton"/>
<TextView
android:id="@+id/transaction_conf_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="0"
android:textSize="14sp"
android:layout_marginTop="8dp"
android:text="@string/tx_amount_no_prefix2"
android:textSize="24sp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_conf_label_textview"/>
app:layout_constraintTop_toBottomOf="@id/transaction_action_textview"/>
<TextView
android:id="@+id/transaction_block_height_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/block_height"
android:textSize="18sp"
android:layout_marginTop="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_conf_textview"/>
<TextView
android:id="@+id/tx_block_height_textview"
android:id="@+id/transaction_amount_units_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="0"
android:textSize="14sp"
android:layout_marginTop="8dp"
android:text="XMR"
android:layout_marginStart="8dp"
android:textSize="24sp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/transaction_amount_textview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_block_height_label_textview"/>
<TextView
android:id="@+id/transaction_amount_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/amount_label"
android:textSize="18sp"
android:layout_marginTop="16dp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tx_block_height_textview"/>
<TextView
android:id="@+id/transaction_amount_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/tx_amount_no_prefix"
android:textSize="14sp"
android:layout_marginTop="8dp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_amount_label_textview"/>
app:layout_constraintTop_toBottomOf="@id/transaction_action_textview"/>
<TextView
android:id="@+id/transaction_address_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/transaction_destination"
android:textSize="18sp"
android:text="@string/transaction_destination_desc"
android:textSize="28sp"
android:layout_marginTop="16dp"
android:textStyle="bold"
android:textColor="@color/oled_addressListColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_amount_textview"/>
@ -153,9 +64,8 @@
android:id="@+id/transaction_address_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/transaction_hash"
android:textSize="14sp"
android:layout_marginTop="8dp"
android:text="@string/transaction_destination"
android:textSize="24sp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
@ -177,24 +87,63 @@
app:layout_constraintTop_toBottomOf="@id/transaction_address_label_textview" />
<TextView
android:id="@+id/transaction_date_label_textview"
android:id="@+id/transaction_hash_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/date"
android:textSize="18sp"
android:layout_marginTop="16dp"
android:text="@string/transaction_hash_desc"
android:textSize="28sp"
android:layout_marginTop="8dp"
android:textStyle="bold"
android:textColor="@color/oled_addressListColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/copy_txaddress_imagebutton"/>
<TextView
android:id="@+id/transaction_hash_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/transaction_hash"
android:textSize="24sp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/copy_txhash_imagebutton"
app:layout_constraintTop_toTopOf="@id/copy_txhash_imagebutton"
app:layout_constraintBottom_toBottomOf="@id/copy_txhash_imagebutton"/>
<ImageButton
android:id="@+id/copy_txhash_imagebutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/transaction_hash_textview"
app:layout_constraintTop_toBottomOf="@id/transaction_hash_label_textview" />
<TextView
android:id="@+id/transaction_date_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/transaction_on_date_label"
android:textSize="28sp"
android:textStyle="bold"
android:textColor="@color/oled_addressListColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/copy_txhash_imagebutton"/>
<TextView
android:id="@+id/transaction_date_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="0"
android:textSize="14sp"
android:layout_marginTop="8dp"
android:textSize="24sp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
@ -202,4 +151,55 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_date_label_textview"/>
<TextView
android:id="@+id/transaction_conf_label_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/transaction_conf_desc"
android:textSize="28sp"
android:layout_marginTop="16dp"
android:textStyle="bold"
android:textColor="@color/oled_addressListColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_date_textview"/>
<TextView
android:id="@+id/transaction_conf_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="0"
android:textSize="24sp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_conf_label_textview"/>
<TextView
android:id="@+id/transaction_conf_label2_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/transaction_conf_desc2_confirmed"
android:textSize="28sp"
android:textStyle="bold"
android:textColor="@color/oled_addressListColor"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_conf_textview"/>
<TextView
android:id="@+id/tx_block_height_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="0"
android:textSize="24sp"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="middle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/transaction_conf_label2_textview"/>
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/values/strings.xml
View file

@ -73,13 +73,16 @@
<string name="add_node">Add Node</string>
<string name="nodes">Nodes</string>
<string name="node_name_hint">My Monero Node</string>
<string name="node_address_hint">127.0.0.1:18081</string>
<string name="node_address_hint">127.0.0.1</string>
<string name="node_port_hint">18081</string>
<string name="node_username_hint">Username (optional)</string>
<string name="node_password_hint">Password</string>
<string name="transaction">Transaction</string>
<string name="transaction_action_sent">You sent</string>
<string name="transaction_action_recv">You received</string>
<string name="amount_label">Amount</string>
<string name="tx_amount_no_prefix">%1$s XMR</string>
<string name="tx_amount_no_prefix2">999.99999999999</string>
<string name="wallet_proxy_address_hint">127.0.0.1</string>
<string name="wallet_proxy_port_hint">9050</string>
<string name="no_history_loading">Loading your wallet…</string>
@ -89,9 +92,16 @@
<string name="disconnected">Disconnected</string>
<string name="version_mismatch">Version mismatch</string>
<string name="transaction_hash">Transaction Hash</string>
<string name="transaction_hash_desc">in a transaction with id</string>
<string name="transaction_destination">Destination</string>
<string name="transaction_destination_desc">to address</string>
<string name="confirmations">Confirmations</string>
<string name="transaction_conf_desc">It has been confirmed</string>
<string name="transaction_conf_desc2_confirmed">times, and was mined in block</string>
<string name="transaction_conf_desc2_unconfirmed">times, and is currently in the mempool</string>
<string name="transaction_conf_1_desc2_confirmed">time, and was mined in block</string>
<string name="date">Date</string>
<string name="transaction_on_date_label">on</string>
<string name="node_selected">Node has been selected</string>
<string name="fee_priority">Fee priority:</string>
<string name="low">Low</string>