diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java index e4ae88ed..5ab6ad7b 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java @@ -539,7 +539,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste @Override public void onSendRequest(View view) { - replaceFragmentWithTransition(view, SendFragment.newInstance(uri), null, null); + replaceFragment(SendFragment.newInstance(uri), null, null); uri = null; // only use uri once } @@ -800,10 +800,6 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste int transition; if (newFragment instanceof TxFragment) transition = R.string.tx_details_transition_name; - else if (newFragment instanceof ReceiveFragment) - transition = R.string.receive_transition_name; - else if (newFragment instanceof SendFragment) - transition = R.string.send_transition_name; else if (newFragment instanceof SubaddressInfoFragment) transition = R.string.subaddress_info_transition_name; else @@ -960,7 +956,7 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste Bundle b = new Bundle(); b.putString("address", address); b.putString("name", getWalletName()); - replaceFragmentWithTransition(view, new ReceiveFragment(), null, b); + replaceFragment(new ReceiveFragment(), null, b); Timber.d("ReceiveFragment placed"); } diff --git a/app/src/main/res/layout/fragment_receive.xml b/app/src/main/res/layout/fragment_receive.xml index 3a2553c4..c4bea6e0 100644 --- a/app/src/main/res/layout/fragment_receive.xml +++ b/app/src/main/res/layout/fragment_receive.xml @@ -31,8 +31,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:text="@string/tx_subaddress" - android:textAlignment="textStart" - android:transitionName="@string/receive_transition_name" /> + android:textAlignment="textStart" /> <LinearLayout android:layout_width="match_parent" @@ -98,7 +97,6 @@ android:backgroundTint="#ffffffff" android:clickable="true" android:focusable="true" - android:foreground="?android:attr/selectableItemBackground" card_view:contentPadding="4dp"> <TextView @@ -119,7 +117,8 @@ android:id="@+id/qrCode" android:layout_width="match_parent" android:layout_height="match_parent" - android:adjustViewBounds="true" /> + android:adjustViewBounds="true" + android:src="#fff" /> </com.google.android.material.card.MaterialCardView> <TextView diff --git a/app/src/main/res/layout/fragment_send_address.xml b/app/src/main/res/layout/fragment_send_address.xml index d429d338..375e0f0e 100644 --- a/app/src/main/res/layout/fragment_send_address.xml +++ b/app/src/main/res/layout/fragment_send_address.xml @@ -45,8 +45,7 @@ android:hint="@string/send_address_hint" android:imeOptions="actionNext" android:inputType="textMultiLine" - android:textAlignment="textStart" - android:transitionName="@string/send_transition_name" /> + android:textAlignment="textStart" /> </com.google.android.material.textfield.TextInputLayout> <ImageButton diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index 668f3b31..80aa34dd 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -177,7 +177,6 @@ android:layout_weight="1" android:enabled="false" android:text="@string/label_wallet_receive" - android:transitionName="@string/receive_btn_transition_name" app:icon="@drawable/ic_hand" /> <Button @@ -190,7 +189,6 @@ android:layout_weight="1" android:enabled="false" android:text="@string/label_wallet_send" - android:transitionName="@string/send_btn_transition_name" app:icon="@drawable/ic_send" /> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index efd5f4ed..78f65630 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -474,10 +474,6 @@ <string name="tx_item_transition_name" translatable="false">tx_transition_%1$s</string> <string name="tx_details_transition_name" translatable="false">tx_transition</string> - <string name="receive_btn_transition_name" translatable="false">receive_btn_transition</string> - <string name="receive_transition_name" translatable="false">receive_transition</string> - <string name="send_btn_transition_name" translatable="false">send_btn_transition</string> - <string name="send_transition_name" translatable="false">send_transition</string> <string name="subaddress_item_transition_name" translatable="false">subaddress_transition_%1$d</string> <string name="subaddress_info_transition_name" translatable="false">subaddress_transition</string> <string name="subaddress_txinfo_transition_name" translatable="false">subaddress_txinfo_transition</string>