bump version

Send & Receive UI transitions

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 710
-        versionName "1.17.10 'Druk'"
+        versionCode 712
+        versionName "1.17.12 'Druk'"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/java/com/m2049r/xmrwallet/ReceiveFragment.java

@@ -16,6 +16,7 @@
 
 package com.m2049r.xmrwallet;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -43,6 +44,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.ShareActionProvider;
 import androidx.core.content.FileProvider;
@@ -50,13 +52,13 @@ import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.textfield.TextInputLayout;
+import com.google.android.material.transition.MaterialContainerTransform;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-import com.m2049r.xmrwallet.BuildConfig;
 import com.m2049r.xmrwallet.data.BarcodeData;
 import com.m2049r.xmrwallet.data.Crypto;
 import com.m2049r.xmrwallet.ledger.LedgerProgressDialog;
@@ -64,6 +66,7 @@ import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.MoneroThreadPoolExecutor;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.ExchangeView;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
@@ -72,6 +75,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import timber.log.Timber;
 
@@ -84,7 +88,6 @@ public class ReceiveFragment extends Fragment {
     private ExchangeView evAmount;
     private TextView tvQrCode;
     private ImageView ivQrCode;
-    private View cvQrCode;
     private ImageView ivQrCodeFull;
     private EditText etDummy;
     private ImageButton bCopyAddress;
@@ -112,7 +115,6 @@ public class ReceiveFragment extends Fragment {
         tvAddress = view.findViewById(R.id.tvAddress);
         etNotes = view.findViewById(R.id.etNotes);
         evAmount = view.findViewById(R.id.evAmount);
-        cvQrCode = view.findViewById(R.id.cvQrCode);
         ivQrCode = view.findViewById(R.id.qrCode);
         tvQrCode = view.findViewById(R.id.tvQrCode);
         ivQrCodeFull = view.findViewById(R.id.qrCodeFull);
@@ -126,40 +128,31 @@ public class ReceiveFragment extends Fragment {
         enableCopyAddress(false);
         enableSubaddressButton(false);
 
-        evAmount.setOnNewAmountListener(new ExchangeView.OnNewAmountListener() {
-            @Override
-            public void onNewAmount(String xmr) {
+        evAmount.setOnNewAmountListener(xmr -> {
             Timber.d("new amount = %s", xmr);
             generateQr();
-            }
         });
 
-        evAmount.setOnFailedExchangeListener(new ExchangeView.OnFailedExchangeListener() {
-            @Override
-            public void onFailedExchange() {
+        evAmount.setOnFailedExchangeListener(() -> {
             if (isAdded()) {
                 clearQR();
                 Toast.makeText(getActivity(), getString(R.string.message_exchange_failed), Toast.LENGTH_LONG).show();
             }
-            }
         });
 
         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) {
+        notesEdit.setOnEditorActionListener((v, actionId, event) -> {
             if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
                     || (actionId == EditorInfo.IME_ACTION_DONE)) {
                 generateQr();
                 return true;
             }
             return false;
-            }
         });
         notesEdit.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
             }
 
             @Override
@@ -169,30 +162,20 @@ public class ReceiveFragment extends Fragment {
 
             @Override
             public void afterTextChanged(Editable s) {
-
             }
         });
 
-        bSubaddress.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+        bSubaddress.setOnClickListener(v -> {
             enableSubaddressButton(false);
             enableCopyAddress(false);
 
-                final Runnable newAddress = new Runnable() {
-                    public void run() {
-                        getNewSubaddress();
-                    }
-                };
+            final Runnable newAddress = this::getNewSubaddress;
 
             tvAddress.animate().alpha(0).setDuration(250)
                     .withEndAction(newAddress).start();
-            }
         });
 
-        cvQrCode.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+        view.findViewById(R.id.cvQrCode).setOnClickListener(v -> {
             Helper.hideKeyboard(getActivity());
             etDummy.requestFocus();
             if (qrValid) {
@@ -201,15 +184,11 @@ public class ReceiveFragment extends Fragment {
             } else {
                 evAmount.doExchange();
             }
-            }
         });
 
-        ivQrCodeFull.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+        ivQrCodeFull.setOnClickListener(v -> {
             ivQrCodeFull.setImageBitmap(null);
             ivQrCodeFull.setVisibility(View.GONE);
-            }
         });
 
         showProgress();
@@ -244,12 +223,17 @@ public class ReceiveFragment extends Fragment {
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        transform.setDrawingViewId(R.id.fragment_container);
+        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(Objects.requireNonNull(getContext()), R.attr.colorSurface));
+        setSharedElementEnterTransition(transform);
     }
 
     private ShareActionProvider shareActionProvider;
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, final MenuInflater inflater) {
         inflater.inflate(R.menu.receive_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
 
@@ -320,7 +304,7 @@ public class ReceiveFragment extends Fragment {
     }
 
     void copyAddress() {
-        Helper.clipBoardCopy(getActivity(), getString(R.string.label_copy_address), tvAddress.getText().toString());
+        Helper.clipBoardCopy(Objects.requireNonNull(getActivity()), getString(R.string.label_copy_address), tvAddress.getText().toString());
         Toast.makeText(getActivity(), getString(R.string.message_copy_address), Toast.LENGTH_SHORT).show();
     }
 
@@ -381,6 +365,7 @@ public class ReceiveFragment extends Fragment {
 
     GenerateReviewFragment.ProgressListener progressCallback = null;
 
+    @SuppressLint("StaticFieldLeak")
     private class AsyncShow extends AsyncTask<Void, Void, Boolean> {
         final private String walletPath;
         final private String password;
@@ -434,8 +419,8 @@ public class ReceiveFragment extends Fragment {
         new AsyncStore().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
     }
 
+    @SuppressLint("StaticFieldLeak")
     private class AsyncStore extends AsyncTask<String, Void, Boolean> {
-
         @Override
         protected Boolean doInBackground(String... params) {
             if (params.length != 0) return false;
@@ -520,12 +505,12 @@ public class ReceiveFragment extends Fragment {
         canvas.save();
         // figure out how to scale the logo
         float scaleSize = 1.0f;
-        while ((logoWidth / scaleSize) > (qrWidth / 5) || (logoHeight / scaleSize) > (qrHeight / 5)) {
+        while ((logoWidth / scaleSize) > (qrWidth / 5.) || (logoHeight / scaleSize) > (qrHeight / 5.)) {
             scaleSize *= 2;
         }
         float sx = 1.0f / scaleSize;
-        canvas.scale(sx, sx, qrWidth / 2, qrHeight / 2);
-        canvas.drawBitmap(logo, (qrWidth - logoWidth) / 2, (qrHeight - logoHeight) / 2, null);
+        canvas.scale(sx, sx, qrWidth / 2f, qrHeight / 2f);
+        canvas.drawBitmap(logo, (qrWidth - logoWidth) / 2f, (qrHeight - logoHeight) / 2f, null);
         canvas.restore();
         return logoBitmap;
     }
@@ -550,7 +535,7 @@ public class ReceiveFragment extends Fragment {
     Listener listenerCallback = null;
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         if (context instanceof Listener) {
             this.listenerCallback = (Listener) context;
@@ -585,6 +570,7 @@ public class ReceiveFragment extends Fragment {
         new AsyncSubaddress().executeOnExecutor(MoneroThreadPoolExecutor.MONERO_THREAD_POOL_EXECUTOR);
     }
 
+    @SuppressLint("StaticFieldLeak")
     private class AsyncSubaddress extends AsyncTask<Void, Void, Boolean> {
         private String newSubaddress;
 
@@ -619,11 +605,7 @@ public class ReceiveFragment extends Fragment {
                     wallet.getNumSubaddresses() - 1));
             generateQr();
             enableCopyAddress(true);
-            final Runnable resetSize = new Runnable() {
-                public void run() {
-                    tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start();
-                }
-            };
+            final Runnable resetSize = () -> tvAddress.animate().setDuration(125).scaleX(1).scaleY(1).start();
             tvAddress.animate().alpha(1).setDuration(125)
                     .scaleX(1.2f).scaleY(1.2f)
                     .withEndAction(resetSize).start();

app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java

@@ -36,6 +36,7 @@ import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -57,13 +58,14 @@ import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import timber.log.Timber;
 
 public class WalletFragment extends Fragment
         implements TransactionInfoAdapter.OnInteractionListener {
     private TransactionInfoAdapter adapter;
-    private NumberFormat formatter = NumberFormat.getInstance();
+    private final NumberFormat formatter = NumberFormat.getInstance();
 
     private TextView tvStreetView;
     private LinearLayout llBalance;
@@ -80,7 +82,7 @@ public class WalletFragment extends Fragment
 
     private Spinner sCurrency;
 
-    private List<String> dismissedTransactions = new ArrayList<>();
+    private final List<String> dismissedTransactions = new ArrayList<>();
 
     public void resetDismissedTransactions() {
         dismissedTransactions.clear();
@@ -93,7 +95,7 @@ public class WalletFragment extends Fragment
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         if (activityCallback.hasWallet())
             inflater.inflate(R.menu.wallet_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
@@ -104,6 +106,13 @@ public class WalletFragment extends Fragment
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_wallet, container, false);
 
+        final MaterialElevationScale exitTransition = new MaterialElevationScale(false);
+        exitTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setExitTransition(exitTransition);
+        final MaterialElevationScale reenterTransition = new MaterialElevationScale(true);
+        reenterTransition.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        setReenterTransition(reenterTransition);
+
         ivStreetGunther = view.findViewById(R.id.ivStreetGunther);
         tvStreetView = view.findViewById(R.id.tvStreetView);
         llBalance = view.findViewById(R.id.llBalance);
@@ -124,7 +133,7 @@ public class WalletFragment extends Fragment
         List<String> currencies = new ArrayList<>();
         currencies.add(Helper.BASE_CRYPTO);
         currencies.addAll(Arrays.asList(getResources().getStringArray(R.array.currency)));
-        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(getContext(), R.layout.item_spinner_balance, currencies);
+        ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<>(Objects.requireNonNull(getContext()), R.layout.item_spinner_balance, currencies);
         spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         sCurrency.setAdapter(spinnerAdapter);
 
@@ -169,18 +178,8 @@ public class WalletFragment extends Fragment
         recyclerView.addOnItemTouchListener(swipeTouchListener);
 
 
-        bSend.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                activityCallback.onSendRequest();
-            }
-        });
-        bReceive.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                activityCallback.onWalletReceive();
-            }
-        });
+        bSend.setOnClickListener(v -> activityCallback.onSendRequest(v));
+        bReceive.setOnClickListener(v -> activityCallback.onWalletReceive(v));
 
         sCurrency.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
@@ -203,6 +202,16 @@ public class WalletFragment extends Fragment
         return view;
     }
 
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        postponeEnterTransition();
+        view.getViewTreeObserver().addOnPreDrawListener(() -> {
+            startPostponedEnterTransition();
+            return true;
+        });
+    }
+
     void showBalance(String balance) {
         tvBalance.setText(balance);
         final boolean streetMode = activityCallback.isStreetMode();
@@ -260,24 +269,14 @@ public class WalletFragment extends Fragment
                             @Override
                             public void onSuccess(final ExchangeRate exchangeRate) {
                                 if (isAdded())
-                                    new Handler(Looper.getMainLooper()).post(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            exchange(exchangeRate);
-                                        }
-                                    });
+                                    new Handler(Looper.getMainLooper()).post(() -> exchange(exchangeRate));
                             }
 
                             @Override
                             public void onError(final Exception e) {
                                 Timber.e(e.getLocalizedMessage());
                                 if (isAdded())
-                                    new Handler(Looper.getMainLooper()).post(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            exchangeFailed();
-                                        }
-                                    });
+                                    new Handler(Looper.getMainLooper()).post(() -> exchangeFailed());
                             }
                         });
             } else {
@@ -418,7 +417,6 @@ public class WalletFragment extends Fragment
     void setActivityTitle(Wallet wallet) {
         if (wallet == null) return;
         walletTitle = wallet.getName();
-        String watchOnly = (wallet.isWatchOnly() ? getString(R.string.label_watchonly) : "");
         walletSubtitle = wallet.getAccountLabel();
         activityCallback.setTitle(walletTitle, walletSubtitle);
         Timber.d("wallet title is %s", walletTitle);
@@ -442,7 +440,7 @@ public class WalletFragment extends Fragment
         balance = wallet.getBalance();
         unlockedBalance = wallet.getUnlockedBalance();
         refreshBalance();
-        String sync = "";
+        String sync;
         if (!activityCallback.hasBoundService())
             throw new IllegalStateException("WalletService not bound.");
         Wallet.ConnectionStatus daemonConnected = activityCallback.getConnectionStatus();
@@ -483,7 +481,7 @@ public class WalletFragment extends Fragment
 
         long getDaemonHeight(); //mBoundService.getDaemonHeight();
 
-        void onSendRequest();
+        void onSendRequest(View view);
 
         void onTxDetailsRequest(View view, TransactionInfo info);
 
@@ -497,7 +495,7 @@ public class WalletFragment extends Fragment
 
         String getTxKey(String txId);
 
-        void onWalletReceive();
+        void onWalletReceive(View view);
 
         boolean hasWallet();
 
@@ -511,7 +509,7 @@ public class WalletFragment extends Fragment
     }
 
     @Override
-    public void onAttach(Context context) {
+    public void onAttach(@NonNull Context context) {
         super.onAttach(context);
         if (context instanceof Listener) {
             this.activityCallback = (Listener) context;
@@ -554,7 +552,7 @@ public class WalletFragment extends Fragment
         //TODO figure out why gunther disappears on return from send although he is still set
         if (enable) {
             if (streetGunther == null)
-                streetGunther = ContextCompat.getDrawable(getContext(), R.drawable.ic_gunther_streetmode);
+                streetGunther = ContextCompat.getDrawable(Objects.requireNonNull(getContext()), R.drawable.ic_gunther_streetmode);
             ivStreetGunther.setImageDrawable(streetGunther);
         } else
             ivStreetGunther.setImageDrawable(null);

app/src/main/java/com/m2049r/xmrwallet/fragment/send/SendFragment.java

@@ -36,6 +36,7 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.transition.MaterialContainerTransform;
 import com.m2049r.xmrwallet.OnBackPressedListener;
 import com.m2049r.xmrwallet.OnUriScannedListener;
 import com.m2049r.xmrwallet.R;
@@ -49,10 +50,12 @@ import com.m2049r.xmrwallet.layout.SpendViewPager;
 import com.m2049r.xmrwallet.model.PendingTransaction;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.Notice;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.widget.DotBar;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
 import java.lang.ref.WeakReference;
+import java.util.Objects;
 
 import timber.log.Timber;
 
@@ -309,7 +312,7 @@ public class SendFragment extends Fragment
         SparseArray<WeakReference<SendWizardFragment>> myFragments = new SparseArray<>();
 
         public SpendPagerAdapter(FragmentManager fm) {
-            super(fm);
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         }
 
         public void addSuccess() {
@@ -538,14 +541,18 @@ public class SendFragment extends Fragment
         enableNavigation();
     }
 
-    @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+        final MaterialContainerTransform transform = new MaterialContainerTransform();
+        transform.setDrawingViewId(R.id.fragment_container);
+        transform.setDuration(getResources().getInteger(R.integer.tx_item_transition_duration));
+        transform.setAllContainerColors(ThemeHelper.getThemedColor(Objects.requireNonNull(getContext()), R.attr.colorSurface));
+        setSharedElementEnterTransition(transform);
     }
 
     @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.send_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }

app/src/main/res/layout/fragment_receive.xml

@@ -3,7 +3,8 @@
     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:layout_height="match_parent"
+    android:transitionName="@string/receive_transition_name">
 
     <EditText
         android:id="@+id/etDummy"

app/src/main/res/layout/fragment_send.xml

@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:transitionName="@string/send_transition_name">
 
     <LinearLayout
         android:id="@+id/llNotice"

app/src/main/res/layout/fragment_wallet.xml

@@ -165,6 +165,7 @@
                     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
@@ -176,6 +177,7 @@
                     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>

app/src/main/res/values/strings.xml

@@ -474,5 +474,9 @@
 
     <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_transition_name" translatable="false">receive_transition</string>
+    <string name="receive_btn_transition_name" translatable="false">receive_btn_transition</string>
+    <string name="send_transition_name" translatable="false">send_transition</string>
+    <string name="send_btn_transition_name" translatable="false">send_btn_transition</string>
 
 </resources>