Merge pull request #137 from m2049r/layout-tweaks

Layout tweaks

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

@@ -64,8 +64,8 @@ public class ReceiveFragment extends Fragment {
     private TextInputLayout etPaymentId;
     private ExchangeView evAmount;
     private Button bPaymentId;
-    private Button bGenerate;
+    private TextView tvQrCode;
-    private ImageView qrCode;
+    private ImageButton qrCode;
     private EditText etDummy;
     private ImageButton bCopyAddress;
 
@@ -90,8 +90,8 @@ public class ReceiveFragment extends Fragment {
         etPaymentId = (TextInputLayout) view.findViewById(R.id.etPaymentId);
         evAmount = (ExchangeView) view.findViewById(R.id.evAmount);
         bPaymentId = (Button) view.findViewById(R.id.bPaymentId);
-        qrCode = (ImageView) view.findViewById(R.id.qrCode);
+        qrCode = (ImageButton) view.findViewById(R.id.qrCode);
-        bGenerate = (Button) view.findViewById(R.id.bGenerate);
+        tvQrCode = (TextView) view.findViewById(R.id.tvQrCode);
         etDummy = (EditText) view.findViewById(R.id.etDummy);
         bCopyAddress = (ImageButton) view.findViewById(R.id.bCopyAddress);
 
@@ -160,7 +160,7 @@ public class ReceiveFragment extends Fragment {
             }
         });
 
-        bGenerate.setOnClickListener(new View.OnClickListener() {
+        qrCode.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (checkPaymentId()) {
@@ -195,14 +195,16 @@ public class ReceiveFragment extends Fragment {
 
     void clearQR() {
         if (qrValid) {
-            qrCode.setImageBitmap(getMoneroLogo());
+            qrCode.setImageBitmap(null);
             qrValid = false;
+            tvQrCode.setVisibility(View.VISIBLE);
         }
     }
 
     void setQR(Bitmap qr) {
         qrCode.setImageBitmap(qr);
         qrValid = true;
+        tvQrCode.setVisibility(View.INVISIBLE);
         Helper.hideKeyboard(getActivity());
         etDummy.requestFocus();
     }
@@ -221,9 +223,7 @@ public class ReceiveFragment extends Fragment {
         listenerCallback.setTitle(name);
         tvAddress.setText(address);
         etPaymentId.setEnabled(true);
-        //etAmount.setEnabled(true);
         bPaymentId.setEnabled(true);
-        bGenerate.setEnabled(true);
         bCopyAddress.setEnabled(true);
         bCopyAddress.setImageResource(R.drawable.ic_content_copy_black_24dp);
         hideProgress();
@@ -307,7 +307,8 @@ public class ReceiveFragment extends Fragment {
             sb.append(ScannerFragment.QR_AMOUNT).append('=').append(xmrAmount);
         }
         String text = sb.toString();
-        Bitmap qr = generate(text, 500, 500);
+        int size = Math.min(qrCode.getHeight(), qrCode.getWidth());
+        Bitmap qr = generate(text, size, size);
         if (qr != null) {
             setQR(qr);
             Log.d(TAG, "SETQR");

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

@@ -46,15 +46,13 @@
         android:textAlignment="center"
         tools:text="9wZnnNctRc7RaLya1rxykH21dUwfQpNGmVLjAvkvqe7nKT2Mw848AJNGMunW5xjoSZ5vCCU3uDnUoVqSSHxzRtQBE3f6crx" />
 
-    <com.m2049r.xmrwallet.layout.ExchangeView
+        <com.m2049r.xmrwallet.layout.ExchangeView
-        android:id="@+id/evAmount"
+            android:id="@+id/evAmount"
-        android:layout_width="match_parent"
+            android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+            android:layout_height="wrap_content"
-        android:layout_marginBottom="16sp"
+            android:layout_marginBottom="16dp"
-        android:layout_marginTop="16sp"
+            android:layout_marginTop="16dp"
-        android:orientation="vertical"
+            android:orientation="vertical" />
-        android:paddingEnd="56dp"
-        android:paddingStart="56dp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -98,22 +96,30 @@
 
     </LinearLayout>
 
-    <Button
+    <FrameLayout
-        android:id="@+id/bGenerate"
-        style="@style/MoneroButton"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent">
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="4dp"
-        android:enabled="false"
-        android:minHeight="36dp"
-        android:text="@string/receive_generate_hint" />
 
-    <ImageView
+        <TextView
-        android:id="@+id/qrCode"
+            android:id="@+id/tvQrCode"
-        android:layout_width="fill_parent"
+            style="@style/MoneroFab"
-        android:layout_height="fill_parent"
+            android:layout_width="wrap_content"
-        android:adjustViewBounds="true" />
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:drawablePadding="4dp"
+            android:drawableStart="@drawable/ic_info_outline_gray_24dp"
+            android:text="@string/label_receive_gen_qr_code"
+            android:textAlignment="center"
+            android:textSize="16sp" />
+
+        <ImageButton
+            android:id="@+id/qrCode"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:adjustViewBounds="true"
+            android:background="#00000000" />
+
+    </FrameLayout>
 
     <EditText
         android:id="@+id/etDummy"

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

@@ -55,9 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:layout_marginTop="0dp"
-            android:orientation="vertical"
+            android:orientation="vertical" />
-            android:paddingEnd="56dp"
-            android:paddingStart="56dp" />
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -20,6 +20,8 @@
     <string name="label_close">Close</string>
     <string name="label_wallet_advanced_details">Touch for detailed information</string>
 
+    <string name="label_receive_gen_qr_code">Touch for QR Code</string>
+
     <string name="backup_progress">Backup in progress</string>
     <string name="archive_progress">Archive in progress</string>
     <string name="rename_progress">Rename in progress</string>