- Fix avatar size layout

- Add helper for Address Book

Author: Mas7erMind

app/src/main/java/io/scalaproject/vault/AddressBookFragment.java

@@ -164,7 +164,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.node_menu, menu);
+        inflater.inflate(R.menu.address_book_menu, menu);
         super.onCreateOptionsMenu(menu, inflater);
     }
 

app/src/main/java/io/scalaproject/vault/WalletActivity.java

@@ -346,6 +346,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_help_send:
                 HelpFragment.display(getSupportFragmentManager(), R.string.help_send);
                 return true;
+            case R.id.action_help_address_book:
+                HelpFragment.display(getSupportFragmentManager(), R.string.help_address_book);
+                return true;
             case R.id.action_rename:
                 onAccountRename();
                 return true;

app/src/main/java/io/scalaproject/vault/layout/ContactInfoAdapter.java

@@ -26,6 +26,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.graphics.Bitmap;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -153,10 +154,20 @@ public void onClick(View v) {
             }
 
             Bitmap avatar = contactItem.getAvatar();
-            if(avatar != null)
+            if(avatar != null) {
+                int dim = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 32, itemView.getResources().getDisplayMetrics());
+                ivAvatar.getLayoutParams().height = dim;
+                ivAvatar.getLayoutParams().width = dim;
+
                 ivAvatar.setImageBitmap(contactItem.getAvatar());
-            else
+            }
+            else {
+                int dim = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 36, itemView.getResources().getDisplayMetrics());
+                ivAvatar.getLayoutParams().height = dim;
+                ivAvatar.getLayoutParams().width = dim;
+
                 ivAvatar.setImageBitmap(Helper.getBitmap(context, R.drawable.ic_contact_avatar));
+            }
         }
 
         @Override

app/src/main/java/io/scalaproject/vault/layout/TransactionInfoAdapter.java

@@ -31,6 +31,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import io.scalaproject.vault.R;
@@ -162,7 +163,11 @@ void bind(int position) {
 
             UserNotes userNotes = new UserNotes(infoItem.notes);
 
+            LinearLayout llTxType = itemView.findViewById(R.id.llTxType);
+
             // just in case
+            llTxType.setBackgroundTintList(itemView.getResources().getColorStateList(R.color.bg_grey));
+
             int dim = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24, itemView.getResources().getDisplayMetrics());
             ivTxType.getLayoutParams().height = dim;
             ivTxType.getLayoutParams().width = dim;
@@ -218,6 +223,8 @@ void bind(int position) {
             else {
                 this.tvPaymentId.setText(Helper.getTruncatedString(contact.getName(), 20));
 
+                llTxType.setBackgroundTintList(itemView.getResources().getColorStateList(R.color.bg_lighter));
+
                 Bitmap avatar = contact.getAvatar();
                 if(avatar != null) {
                     dim = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 32, itemView.getResources().getDisplayMetrics());
@@ -226,6 +233,13 @@ void bind(int position) {
 
                     ivTxType.setImageBitmap(avatar);
                 }
+                else {
+                    dim = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 36, itemView.getResources().getDisplayMetrics());
+                    ivTxType.getLayoutParams().height = dim;
+                    ivTxType.getLayoutParams().width = dim;
+
+                    ivTxType.setImageBitmap(Helper.getBitmap(itemView.getContext(), R.drawable.ic_contact_avatar));
+                }
             }
 
             this.tvDateTime.setText(getDateTime(infoItem.timestamp));

app/src/main/res/drawable/ic_contact_avatar.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="96dp"
+    android:height="96dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 

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

@@ -15,16 +15,23 @@
         android:layout_height="wrap_content"
         android:background="@drawable/corner_radius_lighter_small">
 
-        <ImageView
-            android:id="@+id/ivAvatar"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+        <LinearLayout
+            android:layout_width="42dp"
+            android:layout_height="42dp"
             android:layout_marginStart="8dp"
             android:layout_alignParentStart="true"
             android:layout_centerInParent="true"
             android:gravity="center"
-            android:background="@android:color/transparent"
-            android:src="@drawable/ic_contact_avatar" />
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/ivAvatar"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:background="@android:color/transparent"
+                android:src="@drawable/ic_contact_avatar" />
+
+        </LinearLayout>
 
         <TextView
             android:id="@+id/tvName"

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

@@ -26,6 +26,7 @@
             android:orientation="horizontal">
 
             <LinearLayout
+                android:id="@+id/llTxType"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
                 android:layout_gravity="center"

app/src/main/res/menu/address_book_menu.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_help_address_book"
+        android:icon="@drawable/ic_help_white_24dp"
+        android:orderInCategory="500"
+        android:title="@string/menu_help"
+        app:showAsAction="ifRoom" />
+</menu>

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

@@ -149,6 +149,13 @@
         This was the block your transaction was included in.
     ]]></string>
 
+    <string name="help_address_book"><![CDATA[
+        <h1>Address Book</h1>
+        <p>The Address Book allows you to store the wallet address and other contact information of addresses you frequently use.</p>
+        <p>You can specify the name, wallet address, and image for each of your contact.</p>
+        <p>The Address Book is stored locally on your device and is shared between all your wallets.</p>
+    ]]></string>
+
     <string name="help_send"><![CDATA[
         <h1>Send</h1>
         <h2>Receiver’s address</h2>