wownero
/
wownerujo
Archived
4
0
Fork 0
Code Releases 19 Activity

Description in QR Code (#401)

Browse Source 
* use notes in qr code

* remove payment id on receive

* prep translations
upstream
m2049r 6 years ago committed by GitHub
parent 7424ef07f7
commit e394394538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 267 additions and 277 deletions
Show Stats Download Patch File Download Diff File

64
app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java
Unescape View File

@ -20,15 +20,12 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable;
import android.nfc.NfcAdapter;
import android.nfc.NfcManager;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.Fragment;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@ -67,9 +64,8 @@ public class ReceiveFragment extends Fragment {
private ProgressBar pbProgress;
private TextView tvAddressLabel;
private TextView tvAddress;
private TextInputLayout etPaymentId;
private TextInputLayout etNotes;
private ExchangeView evAmount;
private Button bPaymentId;
private TextView tvQrCode;
private ImageView qrCode;
private ImageView qrCodeFull;
@ -97,9 +93,8 @@ public class ReceiveFragment extends Fragment {
pbProgress = (ProgressBar) view.findViewById(R.id.pbProgress);
tvAddressLabel = (TextView) view.findViewById(R.id.tvAddressLabel);
tvAddress = (TextView) view.findViewById(R.id.tvAddress);
etPaymentId = (TextInputLayout) view.findViewById(R.id.etPaymentId);
etNotes = (TextInputLayout) view.findViewById(R.id.etNotes);
evAmount = (ExchangeView) view.findViewById(R.id.evAmount);
bPaymentId = (Button) view.findViewById(R.id.bPaymentId);
qrCode = (ImageView) view.findViewById(R.id.qrCode);
tvQrCode = (TextView) view.findViewById(R.id.tvQrCode);
qrCodeFull = (ImageView) view.findViewById(R.id.qrCodeFull);
@ -107,7 +102,6 @@ public class ReceiveFragment extends Fragment {
bCopyAddress = (ImageButton) view.findViewById(R.id.bCopyAddress);
bSubaddress = (Button) view.findViewById(R.id.bSubaddress);
etPaymentId.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
bCopyAddress.setOnClickListener(new View.OnClickListener() {
@ -136,41 +130,17 @@ public class ReceiveFragment extends Fragment {
}
});
etPaymentId.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
final EditText notesEdit = etNotes.getEditText();
notesEdit.setRawInputType(InputType.TYPE_CLASS_TEXT);
notesEdit.setOnEditorActionListener(new TextView.OnEditorActionListener() {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
if (checkPaymentId()) { // && evAmount.checkXmrAmount(true)) {
generateQr();
}
generateQr();
return true;
}
return false;
}
});
etPaymentId.getEditText().addTextChangedListener(new TextWatcher() {
@Override
public void afterTextChanged(Editable editable) {
clearQR();
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
});
bPaymentId.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
etPaymentId.getEditText().setText((Wallet.generatePaymentId()));
etPaymentId.getEditText().setSelection(etPaymentId.getEditText().getText().length());
if (checkPaymentId()) { //&& evAmount.checkXmrAmount(true)) {
generateQr();
}
}
});
bSubaddress.setOnClickListener(new View.OnClickListener() {
@Override
@ -195,7 +165,7 @@ public class ReceiveFragment extends Fragment {
if (qrValid) {
qrCodeFull.setImageBitmap(((BitmapDrawable) qrCode.getDrawable()).getBitmap());
qrCodeFull.setVisibility(View.VISIBLE);
} else if (checkPaymentId()) {
} else {
evAmount.doExchange();
}
}
@ -292,8 +262,6 @@ public class ReceiveFragment extends Fragment {
listenerCallback.setTitle(wallet.getName());
listenerCallback.setSubtitle(wallet.getAccountLabel());
tvAddress.setText(wallet.getAddress());
etPaymentId.setEnabled(true);
bPaymentId.setEnabled(true);
enableCopyAddress(true);
hideProgress();
generateQr();
@ -381,18 +349,6 @@ public class ReceiveFragment extends Fragment {
}
}
private boolean checkPaymentId() {
String paymentId = etPaymentId.getEditText().getText().toString();
boolean ok = paymentId.isEmpty() || Wallet.isPaymentIdValid(paymentId);
if (!ok) {
etPaymentId.setError(getString(R.string.receive_paymentid_invalid));
} else {
etPaymentId.setError(null);
}
return ok;
}
public BarcodeData getBarcodeData() {
if (qrValid)
return bcData;
@ -405,15 +361,15 @@ public class ReceiveFragment extends Fragment {
private void generateQr() {
Timber.d("GENQR");
String address = tvAddress.getText().toString();
String paymentId = etPaymentId.getEditText().getText().toString();
String notes = etNotes.getEditText().getText().toString();
String xmrAmount = evAmount.getAmount();
Timber.d("%s/%s/%s", xmrAmount, paymentId, address);
Timber.d("%s/%s/%s", xmrAmount, notes, address);
if ((xmrAmount == null) || !Wallet.isAddressValid(address)) {
clearQR();
Timber.d("CLEARQR");
return;
}
bcData = new BarcodeData(BarcodeData.Asset.XMR, address, paymentId, xmrAmount);
bcData = new BarcodeData(BarcodeData.Asset.XMR, address, null, notes, xmrAmount);
int size = Math.min(qrCode.getHeight(), qrCode.getWidth());
Bitmap qr = generate(bcData.getUriString(), size, size);
if (qr != null) {

24
app/src/main/java/com/m2049r/xmrwallet/data/BarcodeData.java
Unescape View File

@ -30,6 +30,7 @@ public class BarcodeData {
public static final String XMR_SCHEME = "monero:";
public static final String XMR_PAYMENTID = "tx_payment_id";
public static final String XMR_AMOUNT = "tx_amount";
public static final String XMR_DESCRIPTION = "tx_description";
static final String BTC_SCHEME = "bitcoin:";
static final String BTC_AMOUNT = "amount";
@ -42,6 +43,7 @@ public class BarcodeData {
public String address = null;
public String paymentId = null;
public String amount = null;
public String description = null;
public BarcodeData(String uri) {
this.asset = asset;
@ -66,6 +68,14 @@ public class BarcodeData {
this.amount = amount;
}
public BarcodeData(Asset asset, String address, String paymentId, String description, String amount) {
this.asset = asset;
this.address = address;
this.paymentId = paymentId;
this.description = description;
this.amount = amount;
}
public Uri getUri() {
return Uri.parse(getUriString());
}
@ -80,12 +90,13 @@ public class BarcodeData {
first = false;
sb.append(BarcodeData.XMR_PAYMENTID).append('=').append(paymentId);
}
if ((description != null) && !description.isEmpty()) {
sb.append(first ? "?" : "&");
first = false;
sb.append(BarcodeData.XMR_DESCRIPTION).append('=').append(Uri.encode(description));
}
if (!amount.isEmpty()) {
if (first) {
sb.append("?");
} else {
sb.append("&");
}
sb.append(first ? "?" : "&");
sb.append(BarcodeData.XMR_AMOUNT).append('=').append(amount);
}
return sb.toString();
@ -140,6 +151,7 @@ public class BarcodeData {
}
String address = monero.getPath();
String paymentId = parms.get(XMR_PAYMENTID);
String description = parms.get(XMR_DESCRIPTION);
String amount = parms.get(XMR_AMOUNT);
if (amount != null) {
try {
@ -158,7 +170,7 @@ public class BarcodeData {
Timber.d("address invalid");
return null;
}
return new BarcodeData(Asset.XMR, address, paymentId, amount);
return new BarcodeData(Asset.XMR, address, paymentId, description, amount);
}
static public BarcodeData parseMoneroNaked(String address) {

36
app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendAddressWizardFragment.java
Unescape View File

@ -39,9 +39,9 @@ import com.m2049r.xmrwallet.data.BarcodeData;
import com.m2049r.xmrwallet.data.TxData;
import com.m2049r.xmrwallet.data.TxDataBtc;
import com.m2049r.xmrwallet.model.Wallet;
import com.m2049r.xmrwallet.model.WalletManager;
import com.m2049r.xmrwallet.util.BitcoinAddressValidator;
import com.m2049r.xmrwallet.util.Helper;
import com.m2049r.xmrwallet.util.UserNotes;
import timber.log.Timber;
@ -75,6 +75,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
private EditText etDummy;
private TextInputLayout etAddress;
private TextInputLayout etPaymentId;
private TextInputLayout etNotes;
private Button bPaymentId;
private CardView cvScan;
private View tvPaymentIdIntegrated;
@ -155,15 +156,13 @@ public class SendAddressWizardFragment extends SendWizardFragment {
}
});
etPaymentId = (TextInputLayout) view.findViewById(R.id.etPaymentId);
etPaymentId.getEditText().setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
etPaymentId.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_NEXT)) {
if (checkPaymentId()) {
etDummy.requestFocus();
Helper.hideKeyboard(getActivity());
etNotes.requestFocus();
}
return true;
}
@ -193,6 +192,19 @@ public class SendAddressWizardFragment extends SendWizardFragment {
}
});
etNotes = (TextInputLayout) view.findViewById(R.id.etNotes);
etNotes.getEditText().setRawInputType(InputType.TYPE_CLASS_TEXT);
etNotes.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
etDummy.requestFocus();
Helper.hideKeyboard(getActivity());
return true;
}
return false;
}
});
cvScan = (CardView) view.findViewById(R.id.bScan);
cvScan.setOnClickListener(new View.OnClickListener() {
@Override
@ -283,6 +295,7 @@ public class SendAddressWizardFragment extends SendWizardFragment {
txData.setDestinationAddress(etAddress.getEditText().getText().toString());
txData.setPaymentId(etPaymentId.getEditText().getText().toString());
}
txData.setUserNotes(new UserNotes(etNotes.getEditText().getText().toString()));
}
return true;
}
@ -325,14 +338,21 @@ public class SendAddressWizardFragment extends SendWizardFragment {
etAddress.getEditText().getText().clear();
etAddress.setError(null);
}
String scannedPaymenId = barcodeData.paymentId;
if (scannedPaymenId != null) {
etPaymentId.getEditText().setText(scannedPaymenId);
String scannedPaymentId = barcodeData.paymentId;
if (scannedPaymentId != null) {
etPaymentId.getEditText().setText(scannedPaymentId);
checkPaymentId();
} else {
etPaymentId.getEditText().getText().clear();
etPaymentId.setError(null);
}
String scannedNotes = barcodeData.description;
if (scannedNotes != null) {
etNotes.getEditText().setText(scannedNotes);
} else {
etNotes.getEditText().getText().clear();
etNotes.setError(null);
}
} else
Timber.d("barcodeData=null");
}

16
app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendSettingsWizardFragment.java
Unescape View File

@ -62,10 +62,8 @@ public class SendSettingsWizardFragment extends SendWizardFragment {
PendingTransaction.Priority.Priority_High}; // must match the layout XML
private Spinner sPriority;
private EditText etNotes;
private EditText etDummy;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
@ -77,19 +75,6 @@ public class SendSettingsWizardFragment extends SendWizardFragment {
sPriority = (Spinner) view.findViewById(R.id.sPriority);
etNotes = (EditText) view.findViewById(R.id.etNotes);
etNotes.setRawInputType(InputType.TYPE_CLASS_TEXT);
etNotes.setOnEditorActionListener(new TextView.OnEditorActionListener() {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER)) || (actionId == EditorInfo.IME_ACTION_DONE)) {
etDummy.requestFocus();
Helper.hideKeyboard(getActivity());
return true;
}
return false;
}
});
etDummy = (EditText) view.findViewById(R.id.etDummy);
etDummy.setRawInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
@ -102,7 +87,6 @@ public class SendSettingsWizardFragment extends SendWizardFragment {
TxData txData = sendListener.getTxData();
txData.setPriority(Priorities[sPriority.getSelectedItemPosition()]);
txData.setMixin(MIXIN);
txData.setUserNotes(new UserNotes(etNotes.getText().toString()));
}
return true;
}

49
app/src/main/res/layout/fragment_receive.xml
Unescape View File

@ -89,46 +89,21 @@
android:layout_marginTop="16dp"
android:orientation="vertical" />
<LinearLayout
<android.support.design.widget.TextInputLayout
android:id="@+id/etNotes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="10">
android:layout_height="wrap_content">
<android.support.design.widget.TextInputLayout
android:id="@+id/etPaymentId"
android:layout_width="0dp"
<EditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="10"
app:counterEnabled="true"
app:counterMaxLength="16"
app:errorEnabled="true">
android:hint="@string/receive_desc_hint"
android:imeOptions="actionDone"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
<android.support.design.widget.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="@color/moneroGray"
android:hint="@string/receive_paymentid_hint"
android:imeOptions="actionDone"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/bPaymentId"
style="@style/MoneroText.Button.Small"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="0"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:drawableTop="@drawable/ic_settings_orange_24dp"
android:text="@string/send_generate_paymentid_hint"
android:textColor="@color/moneroGray"
android:visibility="visible" />
</LinearLayout>
</android.support.design.widget.TextInputLayout>
<RelativeLayout
android:layout_width="match_parent"
@ -175,9 +150,9 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:gravity="center"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_nfc_black_24dp"
android:gravity="center"
android:text="@string/nfc_tag_tap"
android:visibility="visible" />
</RelativeLayout>

284
app/src/main/res/layout/fragment_send_address.xml
Unescape View File

@ -1,155 +1,187 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<EditText
android:id="@+id/etDummy"
android:layout_width="0dp"
android:layout_height="0dp" />
<android.support.design.widget.TextInputLayout
android:id="@+id/etAddress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:errorEnabled="true">
<android.support.design.widget.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/send_address_hint"
android:imeOptions="actionNext"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
<FrameLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="48dp">
<TextView
android:id="@+id/tvPaymentIdIntegrated"
style="@style/MoneroText.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_margin="8dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_check_gray_24dp"
android:gravity="center"
android:text="@string/info_paymentid_intergrated"
android:textSize="18sp"
android:visibility="invisible" />
android:orientation="vertical">
<LinearLayout
android:id="@+id/llXmrTo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal"
android:visibility="invisible">
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingTop="8dp"
android:src="@drawable/gunther_24dp" />
<EditText
android:id="@+id/etDummy"
android:layout_width="0dp"
android:layout_height="0dp" />
<TextView
android:id="@+id/tvXmrTo"
style="@style/MoneroText.Info"
<android.support.design.widget.TextInputLayout
android:id="@+id/etAddress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:gravity="start|top"
android:singleLine="false"
android:textSize="18sp"
tools:text="@string/info_xmrto" />
</LinearLayout>
app:errorEnabled="true">
<LinearLayout
android:id="@+id/llPaymentId"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="4dp"
android:orientation="horizontal"
android:visibility="visible"
android:weightSum="10">
<android.support.design.widget.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/send_address_hint"
android:imeOptions="actionNext"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tvPaymentIdIntegrated"
style="@style/MoneroText.Info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_margin="8dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_check_gray_24dp"
android:gravity="center"
android:text="@string/info_paymentid_intergrated"
android:textSize="18sp"
android:visibility="invisible" />
<LinearLayout
android:id="@+id/llXmrTo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal"
android:visibility="invisible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:paddingTop="8dp"
android:src="@drawable/gunther_24dp" />
<TextView
android:id="@+id/tvXmrTo"
style="@style/MoneroText.Info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:gravity="start|top"
android:singleLine="false"
android:textSize="18sp"
tools:text="@string/info_xmrto" />
</LinearLayout>
<LinearLayout
android:id="@+id/llPaymentId"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="4dp"
android:orientation="horizontal"
android:visibility="visible"
android:weightSum="10">
<android.support.design.widget.TextInputLayout
android:id="@+id/etPaymentId"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
app:counterEnabled="true"
app:counterMaxLength="16"
app:errorEnabled="true">
<android.support.design.widget.TextInputEditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="10"
android:hint="@string/send_paymentid_hint"
android:imeOptions="actionNext"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/bPaymentId"
style="@style/MoneroText.Button.Small"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:background="?android:selectableItemBackground"
android:drawableTop="@drawable/ic_settings_orange_24dp"
android:text="@string/send_generate_paymentid_hint" />
</LinearLayout>
</FrameLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/etPaymentId"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="10"
app:counterEnabled="true"
app:counterMaxLength="16"
app:errorEnabled="true">
android:id="@+id/etNotes"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
<EditText
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="10"
android:hint="@string/send_paymentid_hint"
android:hint="@string/send_notes_hint"
android:imeOptions="actionDone"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
<Button
android:id="@+id/bPaymentId"
style="@style/MoneroText.Button.Small"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_gravity="center"
android:layout_marginStart="8dp"
android:background="?android:selectableItemBackground"
android:drawableTop="@drawable/ic_settings_orange_24dp"
android:text="@string/send_generate_paymentid_hint" />
</LinearLayout>
</FrameLayout>
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/bScan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="32dp"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
card_view:cardCornerRadius="2dp"
card_view:cardElevation="8dp"
card_view:contentPadding="16dp">
<TextView
style="@style/MoneroText.Button"
android:layout_width="96dp"
android:layout_height="96dp"
android:background="@drawable/ic_scan"
android:gravity="center"
android:text="@string/send_qr_hint"
android:textSize="20dp" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/tvNfc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_nfc_black_24dp"
android:gravity="center"
android:text="@string/nfc_tag_tap"
android:visibility="visible" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="48dp"
android:orientation="vertical">
<android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/bScan"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
card_view:cardCornerRadius="2dp"
card_view:cardElevation="8dp"
card_view:contentPadding="16dp">
<TextView
style="@style/MoneroText.Button"
android:layout_width="96dp"
android:layout_height="96dp"
android:background="@drawable/ic_scan"
android:gravity="center"
android:text="@string/send_qr_hint"
android:textSize="20dp" />
</android.support.v7.widget.CardView>
<TextView
android:id="@+id/tvNfc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_nfc_black_24dp"
android:gravity="center"
android:text="@string/nfc_tag_tap"
android:visibility="visible" />
</LinearLayout>
</LinearLayout>
</ScrollView>

20
app/src/main/res/layout/fragment_send_settings.xml
Unescape View File

@ -43,27 +43,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:gravity="center"
android:drawablePadding="8dp"
android:drawableStart="@drawable/ic_info_outline_gray_24dp"
android:gravity="center"
android:text="@string/info_send_prio_fees" />
<android.support.design.widget.TextInputLayout
android:id="@+id/etAddress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp">
<EditText
android:id="@+id/etNotes"
style="@style/MoneroEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/send_notes_hint"
android:imeOptions="actionDone"
android:inputType="textMultiLine"
android:textAlignment="textStart" />
</android.support.design.widget.TextInputLayout>
</LinearLayout>

2
app/src/main/res/values-de/strings.xml
Unescape View File

@ -347,4 +347,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Beschreibung (optional)</string>
</resources>

2
app/src/main/res/values-el/strings.xml
Unescape View File

@ -346,4 +346,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-es/strings.xml
Unescape View File

@ -333,4 +333,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-fr/strings.xml
Unescape View File

@ -349,4 +349,6 @@
<string name="menu_language">Language</string>
<string name="language_system_default">Use System Language</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-hu/strings.xml
Unescape View File

@ -347,4 +347,6 @@
<string name="nfc_tag_read_what">Nem tudom, mit akarsz!</string>
<string name="nfc_tag_read_success">Sikeres címkeolvasás</string>
<string name="nfc_tag_tap">NFC elérhető!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-it/strings.xml
Unescape View File

@ -348,4 +348,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

14
app/src/main/res/values-nb/strings.xml
Unescape View File

@ -11,7 +11,7 @@
<string name="menu_rename">Gi nytt navn &#8230;</string>
<string name="menu_archive">Arkiver</string>
<string name="menu_backup">Backup</string>
<string name="menu_changepw">[Forandre passord]</string>
<string name="menu_changepw">[Forandre passord]</string>
<string name="password_weak">Fortsett å skrive &#8230;</string>
<string name="password_fair">Meh &#8230;</string>
@ -96,15 +96,15 @@
<string name="archive_progress">Arkivering pågår</string>
<string name="rename_progress">Nytt navn gis</string>
<string name="open_progress">Sjekker daemon-tilkobling</string>
<string name="changepw_progress">[Passordforandring i gang]</string>
<string name="changepw_progress">[Passordforandring i gang]</string>
<string name="service_progress">Gjør ting ferdig &#8230;\nDette kan ta si tid!</string>
<string name="backup_failed">Backup feila!</string>
<string name="archive_failed">Arkivering feila!</string>
<string name="rename_failed">Kunne ikke gi nytt navn!</string>
<string name="changepw_failed">[Passordforandring feila!]</string>
<string name="changepw_success">[Passord forandra]</string>
<string name="changepw_failed">[Passordforandring feila!]</string>
<string name="changepw_success">[Passord forandra]</string>
<string name="label_daemon">Node</string>
<string name="prompt_daemon">([&lt;bruker&gt;:&lt;pass&gt;@]&lt;daemon&gt;[:&lt;port&gt;])</string>
@ -127,8 +127,8 @@
<string name="prompt_rename">Gi nytt navn til %1$s</string>
<string name="prompt_changepw">[Nytt passord for %1$s]</string>
<string name="prompt_changepwB">[Gjenta passord for %1$s]</string>
<string name="prompt_changepw">[Nytt passord for %1$s]</string>
<string name="prompt_changepwB">[Gjenta passord for %1$s]</string>
<string name="prompt_password">Passord for %1$s</string>
<string name="prompt_fingerprint_auth">[You can also open wallet using fingerprint.\nPlease touch sensor.]</string>
<string name="prompt_send_password">Bekreft passord</string>
@ -346,4 +346,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

4
app/src/main/res/values-pt/strings.xml
Unescape View File

@ -208,7 +208,7 @@
<string name="generate_spendkey_hint">Chave de utilização</string>
<string name="generate_mnemonic_hint">Chave Mnemónica de 25 Palavras</string>
<string name="generate_restoreheight_hint">Restaurar de Altura ou Data (AAAA-MM-DD)</string>
<string name="generate_address_label">Endereço público</string>
<string name="generate_viewkey_label">Chave de visualização</string>
<string name="generate_spendkey_label">Chave de utilização</string>
@ -349,4 +349,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-ro/strings.xml
Unescape View File

@ -346,4 +346,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-ru/strings.xml
Unescape View File

@ -348,4 +348,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

10
app/src/main/res/values-sk/strings.xml
Unescape View File

@ -34,7 +34,7 @@
<string name="info_xmrto_enabled">BTC platby aktivované, klepni pre viac info.</string>
<string name="info_crazypass_enabled">CrAzYpass aktivovaný, klepni pre viac info.</string>
<string name="info_ledger_enabled">Ledger aktivovaný, klepni pre viac info.</string>
<string name="info_ledger_enabled">Ledger aktivovaný, klepni pre viac info.</string>
<string name="info_xmrto"><![CDATA[
<b>Vložil si Bitcoin adresu.</b><br/>
@ -316,11 +316,11 @@
<string name="send_sweepall">Pošli všetky potvrdené prostriedky na tomto účte!</string>
<string name="tx_subaddress">Podadresa #%1$d</string>
<string name="generate_address_label_sub">Verejná Podadresa #%1$d</string>
<string name="menu_language">Jazyk</string>
<string name="language_system_default">Použi jazyk systému</string>
<string name="fab_restore_ledger">Obnoviť z Ledger Nano S</string>
<string name="fab_restore_ledger">Obnoviť z Ledger Nano S</string>
<string name="progress_ledger_progress">Komunikácia s Ledger</string>
<string name="progress_ledger_confirm">Vyžaduje potvrdenie na Ledgeri!</string>
@ -345,4 +345,6 @@
<string name="nfc_tag_read_what">Neviem čo tým básnik myslel!</string>
<string name="nfc_tag_read_success">Čítanie Tagu úspešné</string>
<string name="nfc_tag_tap">NFC je dostupné!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-sv/strings.xml
Unescape View File

@ -330,4 +330,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-zh-rCN/strings.xml
Unescape View File

@ -344,4 +344,6 @@
<string name="nfc_tag_read_what">I don\'t know what you want!</string>
<string name="nfc_tag_read_success">Reading Tag successful</string>
<string name="nfc_tag_tap">NFC Available!</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

2
app/src/main/res/values-zh-rTW/strings.xml
Unescape View File

@ -345,4 +345,6 @@
<string name="nfc_tag_read_what">無法執行此 NFC 標籤的操作！</string>
<string name="nfc_tag_read_success">已成功讀取此 NFC 標籤</string>
<string name="nfc_tag_tap">可使用 NFC 標籤</string>
<string name="receive_desc_hint">Description (optional)</string>
</resources>

1
app/src/main/res/values/strings.xml
Unescape View File

@ -286,6 +286,7 @@
<string name="receive_paymentid_hint">Payment ID (optional)</string>
<string name="receive_amount_hint">Amount</string>
<string name="receive_desc_hint">Description (optional)</string>
<string name="receive_cannot_open">Could not open wallet!</string>
<string name="receive_paymentid_invalid">16 or 64 Hex characters (0&#8211;9,a&#8211;f)</string>
<string name="receive_integrated_paymentid_invalid">Must be empty with integrated address</string>