Slight UI changes and fixes

This commit is contained in:
pokkst 2022-11-19 10:24:07 -06:00
parent db10e1eb03
commit 82ed0f4409
No known key found for this signature in database
GPG Key ID: 90C2ED85E67A50FF
2 changed files with 6 additions and 3 deletions

View File

@ -122,7 +122,7 @@ public class CoinsInfoAdapter extends RecyclerView.Adapter<CoinsInfoAdapter.View
if (!coinsInfo.isUnlocked()) { if (!coinsInfo.isUnlocked()) {
itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.oled_locked_utxo)); itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.oled_locked_utxo));
} else if (selected) { } else if (selected) {
itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.oled_negativeColor)); itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), R.color.oled_colorSecondary));
} else { } else {
itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), android.R.color.transparent)); itemView.setBackgroundColor(ContextCompat.getColor(itemView.getContext(), android.R.color.transparent));
} }

View File

@ -32,6 +32,9 @@ import com.google.android.material.progressindicator.CircularProgressIndicator;
import net.mynero.wallet.R; import net.mynero.wallet.R;
import net.mynero.wallet.data.UserNotes; import net.mynero.wallet.data.UserNotes;
import net.mynero.wallet.model.TransactionInfo; import net.mynero.wallet.model.TransactionInfo;
import net.mynero.wallet.model.Wallet;
import net.mynero.wallet.service.PrefService;
import net.mynero.wallet.util.Constants;
import net.mynero.wallet.util.Helper; import net.mynero.wallet.util.Helper;
import net.mynero.wallet.util.ThemeHelper; import net.mynero.wallet.util.ThemeHelper;
@ -111,8 +114,8 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
} }
public void bind(TransactionInfo txInfo) { public void bind(TransactionInfo txInfo) {
String displayAmount = Helper.getDisplayAmount(txInfo.amount, Helper.DISPLAY_DIGITS_INFO); boolean streetModeEnabled = PrefService.getInstance().getBoolean(Constants.PREF_STREET_MODE, false);
String displayAmount = streetModeEnabled ? Constants.STREET_MODE_BALANCE : Helper.getDisplayAmount(txInfo.amount, Helper.DISPLAY_DIGITS_INFO);
TextView confirmationsTextView = itemView.findViewById(R.id.tvConfirmations); TextView confirmationsTextView = itemView.findViewById(R.id.tvConfirmations);
CircularProgressIndicator confirmationsProgressBar = itemView.findViewById(R.id.pbConfirmations); CircularProgressIndicator confirmationsProgressBar = itemView.findViewById(R.id.pbConfirmations);
confirmationsProgressBar.setMax(TransactionInfo.CONFIRMATION); confirmationsProgressBar.setMax(TransactionInfo.CONFIRMATION);