diff --git a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java index 6a7e0213..8ec29c7e 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/GenerateReviewFragment.java @@ -103,6 +103,7 @@ public class GenerateReviewFragment extends Fragment { copyAddress(); } }); + bCopyAddress.setClickable(false); view.findViewById(R.id.bAdvancedInfo).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -213,7 +214,7 @@ public class GenerateReviewFragment extends Fragment { tvWalletViewKey.setText(viewKey); tvWalletSpendKey.setText(spendKey); bAdvancedInfo.setVisibility(View.VISIBLE); - bCopyAddress.setEnabled(true); + bCopyAddress.setClickable(true); bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp); activityCallback.setTitle(name, getString(R.string.details_title)); activityCallback.setToolbarButton( diff --git a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java index 52d51c7b..e7b8dae6 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java @@ -106,6 +106,7 @@ public class ReceiveFragment extends Fragment { copyAddress(); } }); + bCopyAddress.setClickable(false); evAmount.setOnNewAmountListener(new ExchangeView.OnNewAmountListener() { @Override @@ -240,7 +241,7 @@ public class ReceiveFragment extends Fragment { tvAddress.setText(address); etPaymentId.setEnabled(true); bPaymentId.setEnabled(true); - bCopyAddress.setEnabled(true); + bCopyAddress.setClickable(true); bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp); hideProgress(); generateQr(); diff --git a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java index 664ee609..2146eb6a 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java +++ b/app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java @@ -99,7 +99,7 @@ public class SendFragment extends Fragment public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - final View view = inflater.inflate(R.layout.fragment_send_new, container, false); + final View view = inflater.inflate(R.layout.fragment_send, container, false); llNavBar = view.findViewById(R.id.llNavBar); bDone = (Button) view.findViewById(R.id.bDone); diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml index bb764855..4d8b5d34 100644 --- a/app/src/main/res/layout/fragment_receive.xml +++ b/app/src/main/res/layout/fragment_receive.xml @@ -42,7 +42,7 @@ android:layout_gravity="end" android:layout_marginEnd="80dp" android:background="?android:selectableItemBackground" - android:enabled="false" + android:clickable="false" android:src="@drawable/ic_content_nocopy_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_review.xml b/app/src/main/res/layout/fragment_review.xml index bd294a33..fb847763 100644 --- a/app/src/main/res/layout/fragment_review.xml +++ b/app/src/main/res/layout/fragment_review.xml @@ -86,7 +86,7 @@ android:layout_gravity="end" android:layout_marginEnd="80dp" android:background="?android:selectableItemBackground" - android:enabled="false" + android:clickable="false" android:src="@drawable/ic_content_nocopy_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml index 610db214..7941224f 100644 --- a/app/src/main/res/layout/fragment_send.xml +++ b/app/src/main/res/layout/fragment_send.xml @@ -1,296 +1,71 @@ - + android:orientation="vertical"> - + + + + - - - - - - - - -