bump version

Send & Receive UI transitions

.gitignore

@@ -15,3 +15,4 @@
 /app/alphaStagenet
 /app/prodStagenet
 /app/.cxx
+/monerujo.id

app/build.gradle

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

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

@@ -59,7 +59,7 @@ import com.m2049r.xmrwallet.model.NetworkType;
 import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.service.WalletService;
-import com.m2049r.xmrwallet.util.ColorHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.DayNightMode;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.KeyStoreHelper;
@@ -78,7 +78,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -376,7 +375,7 @@ public class LoginActivity extends BaseActivity
                             }
 
                             @Override
-                            public void fail(String walletName1, String password, boolean fingerprintUsed) {
+                            public void fail(String walletName) {
                             }
                         });
                     } else { // this cannot really happen as we prefilter choices
@@ -412,7 +411,7 @@ public class LoginActivity extends BaseActivity
                 }
 
                 @Override
-                public void fail(String walletName, String password, boolean fingerprintUsed) {
+                public void fail(String walletName) {
                 }
             });
         } else { // this cannot really happen as we prefilter choices
@@ -707,11 +706,11 @@ public class LoginActivity extends BaseActivity
                 break;
             case NetworkType_Testnet:
                 toolbar.setSubtitle(getString(R.string.connect_testnet));
-                toolbar.setBackgroundResource(ColorHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
                 break;
             case NetworkType_Stagenet:
                 toolbar.setSubtitle(getString(R.string.connect_stagenet));
-                toolbar.setBackgroundResource(ColorHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
+                toolbar.setBackgroundResource(ThemeHelper.getThemedResourceId(this, R.attr.colorPrimaryDark));
                 break;
             default:
                 throw new IllegalStateException("NetworkType unknown: " + net);
@@ -1400,7 +1399,7 @@ public class LoginActivity extends BaseActivity
                         }
 
                         @Override
-                        public void fail(String walletName, String password, boolean fingerprintUsed) {
+                        public void fail(String walletName) {
                         }
 
                     });

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

@@ -258,7 +258,6 @@ public class LoginFragment extends Fragment implements WalletInfoAdapter.OnInter
         walletList.addAll(walletInfos);
         filterList();
         adapter.setInfos(displayedList);
-        adapter.notifyDataSetChanged();
 
         // deal with Gunther & FAB animation
         if (displayedList.isEmpty()) {

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

@@ -524,7 +524,7 @@ public class NodeFragment extends Fragment
                     .setNegativeButton(getString(R.string.label_cancel),
                             (dialog, id) -> {
                                 closeDialog();
-                                nodesAdapter.dataSetChanged(); // to refresh test results
+                                nodesAdapter.setNodes(); // to refresh test results
                             });
 
             editDialog = alertDialogBuilder.create();
@@ -588,7 +588,7 @@ public class NodeFragment extends Fragment
                     if (nodeBackup == null) {
                         nodesAdapter.addNode(nodeInfo);
                     } else {
-                        nodesAdapter.dataSetChanged();
+                        nodesAdapter.setNodes();
                     }
                 }
             }

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

@@ -36,10 +36,12 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.transition.MaterialContainerTransform;
 import com.m2049r.xmrwallet.data.UserNotes;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Transfer;
 import com.m2049r.xmrwallet.model.Wallet;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.widget.Toolbar;
 
@@ -300,7 +302,7 @@ public class TxFragment extends Fragment {
             }
             tvTxXmrToKey.setText(key);
             tvDestinationBtc.setText(userNotes.xmrtoDestination);
-            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " "+ userNotes.xmrtoCurrency);
+            tvTxAmountBtc.setText(userNotes.xmrtoAmount + " " + userNotes.xmrtoCurrency);
             switch (userNotes.xmrtoTag) {
                 case "xmrto":
                     tvXmrToSupport.setVisibility(View.GONE);
@@ -329,6 +331,11 @@ public class TxFragment 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(getContext(), R.attr.colorSurface));
+        setSharedElementEnterTransition(transform);
     }
 
     @Override

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

@@ -36,12 +36,14 @@ 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;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.github.brnunes.swipeablerecyclerview.SwipeableRecyclerViewTouchListener;
+import com.google.android.material.transition.MaterialElevationScale;
 import com.m2049r.xmrwallet.layout.TransactionInfoAdapter;
 import com.m2049r.xmrwallet.model.TransactionInfo;
 import com.m2049r.xmrwallet.model.Wallet;
@@ -56,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;
@@ -79,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();
@@ -92,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);
@@ -103,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);
@@ -123,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);
 
@@ -154,7 +164,6 @@ public class WalletFragment extends Fragment
                                     dismissedTransactions.add(adapter.getItem(position).hash);
                                     adapter.removeItem(position);
                                 }
-                                adapter.notifyDataSetChanged();
                             }
 
                             @Override
@@ -163,25 +172,14 @@ public class WalletFragment extends Fragment
                                     dismissedTransactions.add(adapter.getItem(position).hash);
                                     adapter.removeItem(position);
                                 }
-                                adapter.notifyDataSetChanged();
                             }
                         });
 
         recyclerView.addOnItemTouchListener(swipeTouchListener);
 
 
-        bSend.setOnClickListener(new View.OnClickListener() {
+        bSend.setOnClickListener(v -> activityCallback.onSendRequest(v));
-            @Override
+        bReceive.setOnClickListener(v -> activityCallback.onWalletReceive(v));
-            public void onClick(View v) {
-                activityCallback.onSendRequest();
-            }
-        });
-        bReceive.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                activityCallback.onWalletReceive();
-            }
-        });
 
         sCurrency.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
@@ -204,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();
@@ -261,24 +269,14 @@ public class WalletFragment extends Fragment
                             @Override
                             public void onSuccess(final ExchangeRate exchangeRate) {
                                 if (isAdded())
-                                    new Handler(Looper.getMainLooper()).post(new Runnable() {
+                                    new Handler(Looper.getMainLooper()).post(() -> exchange(exchangeRate));
-                                        @Override
-                                        public void run() {
-                                            exchange(exchangeRate);
-                                        }
-                                    });
                             }
 
                             @Override
                             public void onError(final Exception e) {
                                 Timber.e(e.getLocalizedMessage());
                                 if (isAdded())
-                                    new Handler(Looper.getMainLooper()).post(new Runnable() {
+                                    new Handler(Looper.getMainLooper()).post(() -> exchangeFailed());
-                                        @Override
-                                        public void run() {
-                                            exchangeFailed();
-                                        }
-                                    });
                             }
                         });
             } else {
@@ -334,7 +332,13 @@ public class WalletFragment extends Fragment
     // Callbacks from TransactionInfoAdapter
     @Override
     public void onInteraction(final View view, final TransactionInfo infoItem) {
-        activityCallback.onTxDetailsRequest(infoItem);
+        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);
+        activityCallback.onTxDetailsRequest(view, infoItem);
     }
 
     // called from activity
@@ -352,7 +356,6 @@ public class WalletFragment extends Fragment
                     list.add(info);
             }
             adapter.setInfos(list);
-            adapter.notifyDataSetChanged();
         }
         updateStatus(wallet);
     }
@@ -414,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);
@@ -438,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();
@@ -479,9 +481,9 @@ public class WalletFragment extends Fragment
 
         long getDaemonHeight(); //mBoundService.getDaemonHeight();
 
-        void onSendRequest();
+        void onSendRequest(View view);
 
-        void onTxDetailsRequest(TransactionInfo info);
+        void onTxDetailsRequest(View view, TransactionInfo info);
 
         boolean isSynced();
 
@@ -493,7 +495,7 @@ public class WalletFragment extends Fragment
 
         String getTxKey(String txId);
 
-        void onWalletReceive();
+        void onWalletReceive(View view);
 
         boolean hasWallet();
 
@@ -507,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;
@@ -550,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/data/Node.java

@@ -64,12 +64,14 @@ public class Node {
         return hostAddress.hashCode();
     }
 
-    // Nodes are equal if they are the same host address & are on the same network
+    // Nodes are equal if they are the same host address:port & are on the same network
     @Override
     public boolean equals(Object other) {
         if (!(other instanceof Node)) return false;
         final Node anotherNode = (Node) other;
-        return (hostAddress.equals(anotherNode.hostAddress) && (networkType == anotherNode.networkType));
+        return (hostAddress.equals(anotherNode.hostAddress)
+                && (rpcPort == anotherNode.rpcPort)
+                && (networkType == anotherNode.networkType));
     }
 
     static public Node fromString(String nodeString) {

app/src/main/java/com/m2049r/xmrwallet/data/NodeInfo.java

@@ -227,8 +227,7 @@ public class NodeInfo extends Node {
                 if (response.isSuccessful()) {
                     ResponseBody respBody = response.body(); // closed through Response object
                     if ((respBody != null) && (respBody.contentLength() < 2000)) { // sanity check
-                        final JSONObject json = new JSONObject(
+                        final JSONObject json = new JSONObject(respBody.string());
-                                respBody.string());
                         String rpcVersion = json.getString("jsonrpc");
                         if (!RPC_VERSION.equals(rpcVersion))
                             return false;

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

@@ -332,7 +332,7 @@ public class SendBtcConfirmWizardFragment extends SendWizardFragment implements
                 send();
             }
 
-            public void fail(String walletName, String password, boolean fingerprintUsed) {
+            public void fail(String walletName) {
                 getActivity().runOnUiThread(() -> {
                     bSend.setEnabled(sendCountdown > 0); // allow to try again
                 });

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

@@ -227,7 +227,7 @@ public class SendConfirmWizardFragment extends SendWizardFragment implements Sen
                 send();
             }
 
-            public void fail(String walletName, String password, boolean fingerprintUsed) {
+            public void fail(String walletName) {
                 getActivity().runOnUiThread(() -> {
                     bSend.setEnabled(true); // allow to try again
                 });

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/java/com/m2049r/xmrwallet/layout/DiffCallback.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021 yorha-0x
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.m2049r.xmrwallet.layout;
+
+import androidx.recyclerview.widget.DiffUtil;
+
+import java.util.List;
+
+public abstract class DiffCallback<T> extends DiffUtil.Callback {
+
+    protected final List<T> mOldList;
+    protected final List<T> mNewList;
+
+    public DiffCallback(List<T> oldList, List<T> newList) {
+        this.mOldList = oldList;
+        this.mNewList = newList;
+    }
+
+    @Override
+    public int getOldListSize() {
+        return mOldList.size();
+    }
+
+    @Override
+    public int getNewListSize() {
+        return mNewList.size();
+    }
+
+    public abstract boolean areItemsTheSame(int oldItemPosition, int newItemPosition);
+
+    public abstract boolean areContentsTheSame(int oldItemPosition, int newItemPosition);
+}

app/src/main/java/com/m2049r/xmrwallet/layout/NodeInfoAdapter.java

@@ -25,11 +25,12 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.data.NodeInfo;
-import com.m2049r.xmrwallet.util.ColorHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
 
 import java.net.HttpURLConnection;
@@ -53,7 +54,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
     private final List<NodeInfo> nodeItems = new ArrayList<>();
     private final OnInteractionListener listener;
 
-    private Context context;
+    private final Context context;
 
     public NodeInfoAdapter(Context context, OnInteractionListener listener) {
         this.context = context;
@@ -63,11 +64,34 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
         TS_FORMATTER.setTimeZone(tz);
     }
 
+    private static class NodeDiff extends DiffCallback<NodeInfo> {
+
+        public NodeDiff(List<NodeInfo> oldList, List<NodeInfo> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).equals(mNewList.get(newItemPosition));
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            final NodeInfo oldItem = mOldList.get(oldItemPosition);
+            final NodeInfo newItem = mNewList.get(newItemPosition);
+            return (oldItem.getTimestamp() == newItem.getTimestamp())
+                    && (oldItem.isTested() == newItem.isTested())
+                    && (oldItem.isValid() == newItem.isValid())
+                    && (oldItem.getResponseTime() == newItem.getResponseTime())
+                    && (oldItem.isSelected() == newItem.isSelected())
+                    && (oldItem.getName().equals(newItem.getName()));
+        }
+    }
+
     @Override
     public @NonNull
     ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_node, parent, false);
-                .inflate(R.layout.item_node, parent, false);
         return new ViewHolder(view);
     }
 
@@ -82,25 +106,29 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
     }
 
     public void addNode(NodeInfo node) {
+        List<NodeInfo> newItems = new ArrayList<>(nodeItems);
         if (!nodeItems.contains(node))
-            nodeItems.add(node);
+            newItems.add(node);
-        dataSetChanged(); // in case the nodeinfo has changed
+        setNodes(newItems); // in case the nodeinfo has changed
     }
 
-    public void dataSetChanged() {
+    public void setNodes(Collection<NodeInfo> newItemsCollection) {
-        Collections.sort(nodeItems, NodeInfo.BestNodeComparator);
+        List<NodeInfo> newItems;
-        notifyDataSetChanged();
+        if (newItemsCollection != null) {
-    }
+            newItems = new ArrayList<>(newItemsCollection);
-
+            Collections.sort(newItems, NodeInfo.BestNodeComparator);
-    public void setNodes(Collection<NodeInfo> data) {
+        } else {
-        nodeItems.clear();
+            newItems = new ArrayList<>();
-        if (data != null) {
-            for (NodeInfo node : data) {
-                if (!nodeItems.contains(node))
-                    nodeItems.add(node);
-            }
         }
-        dataSetChanged();
+        final NodeInfoAdapter.NodeDiff diffCallback = new NodeInfoAdapter.NodeDiff(nodeItems, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        nodeItems.clear();
+        nodeItems.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
+    }
+
+    public void setNodes() {
+        setNodes(nodeItems);
     }
 
     private boolean itemsClickable = true;
@@ -130,7 +158,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
                 showStar();
                 if (!nodeItem.isFavourite()) {
                     nodeItem.setSelected(false);
-                    notifyDataSetChanged();
+                    setNodes(nodeItems);
                 }
             });
             itemView.setOnClickListener(this);
@@ -154,7 +182,7 @@ public class NodeInfoAdapter extends RecyclerView.Adapter<NodeInfoAdapter.ViewHo
                     Helper.showTimeDifference(tvIp, nodeItem.getTimestamp());
                 } else {
                     tvIp.setText(getResponseErrorText(context, nodeItem.getResponseCode()));
-                    tvIp.setTextColor(ColorHelper.getThemedColor(tvIp.getContext(), R.attr.colorError));
+                    tvIp.setTextColor(ThemeHelper.getThemedColor(context, R.attr.colorError));
                 }
             } else {
                 tvIp.setText(context.getResources().getString(R.string.node_testing, nodeItem.getHostAddress()));

app/src/main/java/com/m2049r/xmrwallet/layout/TransactionInfoAdapter.java

@@ -23,7 +23,9 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.m2049r.xmrwallet.R;
@@ -38,6 +40,7 @@ import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.TimeZone;
 
 import timber.log.Timber;
@@ -46,10 +49,10 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
 
     private final SimpleDateFormat DATETIME_FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
-    private int outboundColour;
+    private final int outboundColour;
-    private int inboundColour;
+    private final int inboundColour;
-    private int pendingColour;
+    private final int pendingColour;
-    private int failedColour;
+    private final int failedColour;
 
     public interface OnInteractionListener {
         void onInteraction(View view, TransactionInfo item);
@@ -58,7 +61,7 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
     private final List<TransactionInfo> infoItems;
     private final OnInteractionListener listener;
 
-    private Context context;
+    private final Context context;
 
     public TransactionInfoAdapter(Context context, OnInteractionListener listener) {
         this.context = context;
@@ -73,10 +76,32 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
         DATETIME_FORMATTER.setTimeZone(tz);
     }
 
+    private static class TransactionInfoDiff extends DiffCallback<TransactionInfo> {
+
+        public TransactionInfoDiff(List<TransactionInfo> oldList, List<TransactionInfo> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).hash.equals(mNewList.get(newItemPosition).hash);
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            final TransactionInfo oldItem = mOldList.get(oldItemPosition);
+            final TransactionInfo newItem = mNewList.get(newItemPosition);
+            return (oldItem.direction == newItem.direction)
+                    && (oldItem.isPending == newItem.isPending)
+                    && (oldItem.isFailed == newItem.isFailed)
+                    && (Objects.equals(oldItem.notes, newItem.notes));
+        }
+    }
+
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_transaction, parent, false);
-                .inflate(R.layout.item_transaction, parent, false);
         return new ViewHolder(view);
     }
 
@@ -90,23 +115,26 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
         return infoItems.size();
     }
 
-    public void setInfos(List<TransactionInfo> data) {
+    public void setInfos(List<TransactionInfo> newItems) {
-        // TODO do stuff with data so we can really recycle elements (i.e. add only new tx)
+        if (newItems == null) {
-        // as the TransactionInfo items are always recreated, we cannot recycle
+            newItems = new ArrayList<>();
-        infoItems.clear();
-        if (data != null) {
-            Timber.d("setInfos %s", data.size());
-            infoItems.addAll(data);
-            Collections.sort(infoItems);
-        } else {
             Timber.d("setInfos null");
+        } else {
+            Timber.d("setInfos %s", newItems.size());
         }
-        notifyDataSetChanged();
+        Collections.sort(newItems);
+        final DiffCallback<TransactionInfo> diffCallback = new TransactionInfoAdapter.TransactionInfoDiff(infoItems, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        infoItems.clear();
+        infoItems.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
     }
 
     public void removeItem(int position) {
-        infoItems.remove(position);
+        List<TransactionInfo> newItems = new ArrayList<>(infoItems);
-        notifyItemRemoved(position);
+        if (newItems.size() > position)
+            newItems.remove(position);
+        setInfos(newItems); // in case the nodeinfo has changed
     }
 
     public TransactionInfo getItem(int position) {
@@ -139,7 +167,8 @@ public class TransactionInfoAdapter extends RecyclerView.Adapter<TransactionInfo
         }
 
         void bind(int position) {
-            this.infoItem = infoItems.get(position);
+            infoItem = infoItems.get(position);
+            itemView.setTransitionName(context.getString(R.string.tx_item_transition_name, infoItem.hash));
 
             UserNotes userNotes = new UserNotes(infoItem.notes);
             if (userNotes.xmrtoKey != null) {

app/src/main/java/com/m2049r/xmrwallet/layout/WalletInfoAdapter.java

@@ -17,8 +17,6 @@
 package com.m2049r.xmrwallet.layout;
 
 import android.content.Context;
-import androidx.appcompat.widget.PopupMenu;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -26,6 +24,11 @@ import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.m2049r.xmrwallet.R;
 import com.m2049r.xmrwallet.model.WalletManager;
 
@@ -63,6 +66,24 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
         DATETIME_FORMATTER.setTimeZone(tz);
     }
 
+    private static class WalletInfoDiff extends DiffCallback<WalletManager.WalletInfo> {
+
+        public WalletInfoDiff(List<WalletManager.WalletInfo> oldList, List<WalletManager.WalletInfo> newList) {
+            super(oldList, newList);
+        }
+
+        @Override
+        public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).name.equals(mNewList.get(newItemPosition).name);
+        }
+
+        @Override
+        public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
+            return mOldList.get(oldItemPosition).compareTo(mNewList.get(newItemPosition)) == 0;
+        }
+    }
+
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext())
@@ -84,18 +105,19 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
         return infoItems.get(position);
     }
 
-    public void setInfos(List<WalletManager.WalletInfo> data) {
+    public void setInfos(List<WalletManager.WalletInfo> newItems) {
-        // TODO do stuff with data so we can really recycle elements (i.e. add only new tx)
+        if (newItems == null) {
-        // as the WalletInfo items are always recreated, we cannot recycle
+            newItems = new ArrayList<>();
-        infoItems.clear();
-        if (data != null) {
-            Timber.d("setInfos %s", data.size());
-            infoItems.addAll(data);
-            Collections.sort(infoItems);
-        } else {
             Timber.d("setInfos null");
+        } else {
+            Timber.d("setInfos %s", newItems.size());
         }
-        notifyDataSetChanged();
+        Collections.sort(newItems);
+        final DiffCallback<WalletManager.WalletInfo> diffCallback = new WalletInfoAdapter.WalletInfoDiff(infoItems, newItems);
+        final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(diffCallback);
+        infoItems.clear();
+        infoItems.addAll(newItems);
+        diffResult.dispatchUpdatesTo(this);
     }
 
     class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -110,35 +132,24 @@ public class WalletInfoAdapter extends RecyclerView.Adapter<WalletInfoAdapter.Vi
             tvName = itemView.findViewById(R.id.tvName);
             tvAddress = itemView.findViewById(R.id.tvAddress);
             ibOptions = itemView.findViewById(R.id.ibOptions);
-            ibOptions.setOnClickListener(new View.OnClickListener() {
+            ibOptions.setOnClickListener(view -> {
-                @Override
+                if (popupOpen) return;
-                public void onClick(View view) {
+                //creating a popup menu
-                    if (popupOpen) return;
+                PopupMenu popup = new PopupMenu(context, ibOptions);
-                    //creating a popup menu
+                //inflating menu from xml resource
-                    PopupMenu popup = new PopupMenu(context, ibOptions);
+                popup.inflate(R.menu.list_context_menu);
-                    //inflating menu from xml resource
+                popupOpen = true;
-                    popup.inflate(R.menu.list_context_menu);
+                //adding click listener
-                    popupOpen = true;
+                popup.setOnMenuItemClickListener(item -> {
-                    //adding click listener
+                    if (listener != null) {
-                    popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        return listener.onContextInteraction(item, infoItem);
-                        @Override
+                    }
-                        public boolean onMenuItemClick(MenuItem item) {
+                    return false;
-                            if (listener != null) {
+                });
-                                return listener.onContextInteraction(item, infoItem);
+                //displaying the popup
-                            }
+                popup.show();
-                            return false;
+                popup.setOnDismissListener(menu -> popupOpen = false);
-                        }
-                    });
-                    //displaying the popup
-                    popup.show();
-                    popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
-                        @Override
-                        public void onDismiss(PopupMenu menu) {
-                            popupOpen = false;
-                        }
-                    });
 
-                }
             });
             itemView.setOnClickListener(this);
         }

app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@@ -23,7 +23,6 @@ import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -484,7 +483,6 @@ public class Helper {
         }
 
         etPassword.getEditText().addTextChangedListener(new TextWatcher() {
-
             @Override
             public void afterTextChanged(Editable s) {
                 if (etPassword.getError() != null) {
@@ -508,17 +506,16 @@ public class Helper {
                 .setCancelable(false)
                 .setPositiveButton(context.getString(R.string.label_ok), null)
                 .setNegativeButton(context.getString(R.string.label_cancel),
-                        new DialogInterface.OnClickListener() {
+                        (dialog, id) -> {
-                            public void onClick(DialogInterface dialog, int id) {
+                            action.fail(wallet);
-                                Helper.hideKeyboardAlways((Activity) context);
+                            Helper.hideKeyboardAlways((Activity) context);
-                                cancelSignal.cancel();
+                            cancelSignal.cancel();
-                                if (passwordTask != null) {
+                            if (passwordTask != null) {
-                                    passwordTask.cancel(true);
+                                passwordTask.cancel(true);
-                                    passwordTask = null;
+                                passwordTask = null;
-                                }
-                                dialog.cancel();
-                                openDialog = null;
                             }
+                            dialog.cancel();
+                            openDialog = null;
                         });
         openDialog = alertDialogBuilder.create();
 
@@ -561,45 +558,37 @@ public class Helper {
             };
         }
 
-        openDialog.setOnShowListener(new DialogInterface.OnShowListener() {
+        openDialog.setOnShowListener(dialog -> {
-            @Override
+            if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
-            public void onShow(DialogInterface dialog) {
+                tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
-                if (fingerprintAuthAllowed && fingerprintAuthCallback != null) {
+                tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
-                    tvOpenPrompt.setCompoundDrawablesRelativeWithIntrinsicBounds(icFingerprint, null, null, null);
+                tvOpenPrompt.setVisibility(View.VISIBLE);
-                    tvOpenPrompt.setText(context.getText(R.string.prompt_fingerprint_auth));
+                FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
-                    tvOpenPrompt.setVisibility(View.VISIBLE);
+            } else {
-                    FingerprintHelper.authenticate(context, cancelSignal, fingerprintAuthCallback);
+                etPassword.requestFocus();
-                } else {
-                    etPassword.requestFocus();
-                }
-                Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
-                button.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        String pass = etPassword.getEditText().getText().toString();
-                        if (passwordTask == null) {
-                            passwordTask = new PasswordTask(pass, false);
-                            passwordTask.execute();
-                        }
-                    }
-                });
             }
+            Button button = ((AlertDialog) dialog).getButton(AlertDialog.BUTTON_POSITIVE);
+            button.setOnClickListener(view -> {
+                String pass = etPassword.getEditText().getText().toString();
+                if (passwordTask == null) {
+                    passwordTask = new PasswordTask(pass, false);
+                    passwordTask.execute();
+                }
+            });
         });
 
         // accept keyboard "ok"
-        etPassword.getEditText().setOnEditorActionListener(new TextView.OnEditorActionListener() {
+        etPassword.getEditText().setOnEditorActionListener((v, actionId, event) -> {
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+            if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
-                if ((event != null && (event.getKeyCode() == KeyEvent.KEYCODE_ENTER) && (event.getAction() == KeyEvent.ACTION_DOWN))
+                    || (actionId == EditorInfo.IME_ACTION_DONE)) {
-                        || (actionId == EditorInfo.IME_ACTION_DONE)) {
+                String pass = etPassword.getEditText().getText().toString();
-                    String pass = etPassword.getEditText().getText().toString();
+                if (passwordTask == null) {
-                    if (passwordTask == null) {
+                    passwordTask = new PasswordTask(pass, false);
-                        passwordTask = new PasswordTask(pass, false);
+                    passwordTask.execute();
-                        passwordTask.execute();
-                    }
-                    return true;
                 }
-                return false;
+                return true;
             }
+            return false;
         });
 
         if (Helper.preventScreenshot()) {
@@ -613,7 +602,7 @@ public class Helper {
     public interface PasswordAction {
         void act(String walletName, String password, boolean fingerprintUsed);
 
-        void fail(String walletName, String password, boolean fingerprintUsed);
+        void fail(String walletName);
     }
 
     static private boolean processPasswordEntry(Context context, String walletName, String pass, boolean fingerprintUsed, PasswordAction action) {
@@ -622,7 +611,7 @@ public class Helper {
             action.act(walletName, walletPassword, fingerprintUsed);
             return true;
         } else {
-            action.fail(walletName, walletPassword, fingerprintUsed);
+            action.fail(walletName);
             return false;
         }
     }
@@ -667,8 +656,8 @@ public class Helper {
         }
         view.setText(msg);
         if (hours >= STALE_NODE_HOURS)
-            view.setTextColor(ColorHelper.getThemedColor(view.getContext(), R.attr.colorError));
+            view.setTextColor(ThemeHelper.getThemedColor(view.getContext(), R.attr.colorError));
         else
-            view.setTextColor(ColorHelper.getThemedColor(view.getContext(), android.R.attr.textColorPrimary));
+            view.setTextColor(ThemeHelper.getThemedColor(view.getContext(), android.R.attr.textColorPrimary));
     }
 }

app/src/main/java/com/m2049r/xmrwallet/util/ThemeHelper.java

@@ -17,19 +17,26 @@
 package com.m2049r.xmrwallet.util;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.util.TypedValue;
 
-import com.m2049r.xmrwallet.R;
+import androidx.annotation.ColorInt;
 
-public class ColorHelper {
+public class ThemeHelper {
     static public int getThemedResourceId(Context ctx, int attrId) {
-        TypedArray styledAttributes = ctx.getTheme().obtainStyledAttributes(R.style.MyMaterialTheme, new int[]{attrId});
+        final TypedValue typedValue = new TypedValue();
-        return styledAttributes.getResourceId(0, 0);
+        if (ctx.getTheme().resolveAttribute(attrId, typedValue, true))
+            return typedValue.resourceId;
+        else
+            return 0;
     }
 
+    @ColorInt
     static public int getThemedColor(Context ctx, int attrId) {
-        TypedArray styledAttributes = ctx.getTheme().obtainStyledAttributes(R.style.MyMaterialTheme, new int[]{attrId});
+        final TypedValue typedValue = new TypedValue();
-        return styledAttributes.getColor(0, Color.BLACK);
+        if (ctx.getTheme().resolveAttribute(attrId, typedValue, true))
+            return typedValue.data;
+        else
+            return Color.BLACK;
     }
 }

app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java

@@ -42,7 +42,7 @@ import com.m2049r.xmrwallet.model.Wallet;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeApi;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeCallback;
 import com.m2049r.xmrwallet.service.exchange.api.ExchangeRate;
-import com.m2049r.xmrwallet.util.ColorHelper;
+import com.m2049r.xmrwallet.util.ThemeHelper;
 import com.m2049r.xmrwallet.util.Helper;
 import com.m2049r.xmrwallet.util.ServiceHelper;
 
@@ -180,7 +180,7 @@ public class ExchangeView extends LinearLayout {
 
         // make progress circle gray
         pbExchange.getIndeterminateDrawable().
-                setColorFilter(ColorHelper.getThemedColor(getContext(), R.attr.colorPrimaryVariant),
+                setColorFilter(ThemeHelper.getThemedColor(getContext(), R.attr.colorPrimaryVariant),
                         android.graphics.PorterDuff.Mode.MULTIPLY);
 
         sCurrencyA.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {

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_tx_info.xml

@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
-    android:fillViewport="true">
+    android:fillViewport="true"
+    android:transitionName="@string/tx_details_transition_name">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -141,6 +141,7 @@
                 android:layout_height="match_parent"
                 android:clipToPadding="false"
                 android:paddingBottom="80dp"
+                android:transitionGroup="true"
                 app:layoutManager="LinearLayoutManager"
                 tools:listitem="@layout/item_transaction" />
 
@@ -164,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
@@ -175,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/integers.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <integer name="tx_item_transition_duration">300</integer>
+</resources>

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

@@ -471,4 +471,12 @@
         <item>Ethereum</item>
         <item>Litecoin</item>
     </string-array>
+
+    <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>

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

@@ -36,7 +36,7 @@
     </style>
 
     <style name="AppCard" parent="Widget.MaterialComponents.CardView">
-        <item name="cardElevation">8dp</item>
+        <item name="cardElevation">4dp</item>
         <item name="cardCornerRadius">1dp</item>
     </style>