github/xmrwallet
1
Fork 0
mirror of https://github.com/m2049r/xmrwallet synced 2025-04-26 05:59:56 +02:00
Code Releases Activity

remove send/receive transitions

Browse Source
This commit is contained in:
m2049r 2022-03-11 00:25:50 +01:00
parent 604691ca7e
commit 20503d2cbd
No known key found for this signature in database
GPG Key ID: 4386E69AF260078D
5 changed files with 6 additions and 18 deletions

8
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");
}

7
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

3
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

2
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>

4
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>