Fix ImageButton touch targets and some payment uri parsing issues

This commit is contained in:
pokkst 2022-12-15 11:38:20 -06:00
parent df287b1012
commit c444c95d32
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
9 changed files with 34 additions and 41 deletions

View file

@ -63,7 +63,7 @@ public class ReceiveFragment extends Fragment {
} }
private void bindListeners(View view) { private void bindListeners(View view) {
ImageView freshAddressImageView = view.findViewById(R.id.fresh_address_imageview); ImageButton freshAddressImageView = view.findViewById(R.id.fresh_address_imageview);
freshAddressImageView.setOnClickListener(view1 -> { freshAddressImageView.setOnClickListener(view1 -> {
mViewModel.getFreshSubaddress(); mViewModel.getFreshSubaddress();
}); });

View file

@ -23,9 +23,11 @@ public class UriData {
String[] queryParts = queryParams.split("&"); String[] queryParts = queryParams.split("&");
for (String param : queryParts) { for (String param : queryParts) {
String[] paramParts = param.split("="); String[] paramParts = param.split("=");
String variable = paramParts[0]; if(paramParts.length == 2) {
String value = paramParts[1]; String variable = paramParts[0];
params.put(variable, value); String value = paramParts[1];
params.put(variable, value);
}
} }
} }
boolean valid = Wallet.isAddressValid(finalAddress); boolean valid = Wallet.isAddressValid(finalAddress);

View file

@ -48,9 +48,8 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/address_edittext" app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -103,9 +102,8 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/username_edittext" app:layout_constraintBottom_toBottomOf="@id/username_edittext"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -134,9 +132,8 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:visibility="gone" android:visibility="gone"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/password_edittext" app:layout_constraintBottom_toBottomOf="@id/password_edittext"

View file

@ -48,9 +48,8 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/address_edittext" app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -92,9 +91,8 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/username_edittext" app:layout_constraintBottom_toBottomOf="@id/username_edittext"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View file

@ -20,11 +20,14 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<ImageView <ImageButton
android:id="@+id/fresh_address_imageview" android:id="@+id/fresh_address_imageview"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:src="@drawable/lb_ic_replay" android:src="@drawable/lb_ic_replay"
android:minWidth="48dp"
android:minHeight="48dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/recv_monero_textview" app:layout_constraintTop_toTopOf="@id/recv_monero_textview"
app:layout_constraintBottom_toBottomOf="@id/recv_monero_textview" app:layout_constraintBottom_toBottomOf="@id/recv_monero_textview"
@ -89,9 +92,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_copy_24dp" android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintBottom_toTopOf="@id/address_list_recyclerview" app:layout_constraintBottom_toTopOf="@id/address_list_recyclerview"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View file

@ -52,9 +52,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_copy_24dp" android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/transaction_hash_textview" app:layout_constraintStart_toEndOf="@id/transaction_hash_textview"
@ -170,9 +169,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_copy_24dp" android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/transaction_address_textview" app:layout_constraintStart_toEndOf="@id/transaction_address_textview"

View file

@ -45,11 +45,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:background="@android:color/transparent"
android:minWidth="24dp"
android:minHeight="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:padding="8dp" android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/wallet_password_edittext" app:layout_constraintBottom_toBottomOf="@id/wallet_password_edittext"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View file

@ -73,7 +73,6 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="48dp" android:minWidth="48dp"
android:minHeight="48dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/address_edittext" app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toStartOf="@id/scan_address_imagebutton" app:layout_constraintEnd_toStartOf="@id/scan_address_imagebutton"
@ -89,7 +88,6 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="48dp" android:minWidth="48dp"
android:minHeight="48dp" android:minHeight="48dp"
android:padding="8dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:src="@drawable/ic_scan" android:src="@drawable/ic_scan"
app:layout_constraintBottom_toBottomOf="@id/address_edittext" app:layout_constraintBottom_toBottomOf="@id/address_edittext"

View file

@ -71,7 +71,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textSize="16sp" android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/wallet_seed_desc_textview" app:layout_constraintTop_toBottomOf="@id/wallet_seed_desc_textview"
@ -108,7 +108,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:textSize="16sp" android:textSize="14sp"
app:layout_constraintEnd_toStartOf="@id/copy_viewkey_imagebutton" app:layout_constraintEnd_toStartOf="@id/copy_viewkey_imagebutton"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/copy_viewkey_imagebutton" app:layout_constraintTop_toTopOf="@id/copy_viewkey_imagebutton"
@ -120,9 +120,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="24dp" android:minWidth="48dp"
android:minHeight="24dp" android:minHeight="48dp"
android:padding="8dp"
android:src="@drawable/ic_content_copy_24dp" android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_bias="0.0"
@ -145,7 +144,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:textSize="16sp" android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_label_textview" app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_label_textview"