From 1f759aeffd90ccbad81d445d7b75ad35c72366f9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 19 Aug 2016 16:20:01 +0200
Subject: [PATCH] imporove qr code display

---
 Habitica/res/layout/qr_code.xml                     |  5 +++--
 .../android/habitica/helpers/QrCodeManager.java     | 13 +++++++++++--
 .../preferences/AccountDetailsFragment.java         |  8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
index 4711c3aef..cbacea9cb 100644
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@@ -31,9 +31,10 @@
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_gravity="center"
-            android:background="@color/transparent"
+            android:background="@color/white"
             android:clipChildren="true"
-            android:padding="0dp"
+            android:padding="1dp"
+                        android:visibility="gone"
             >
             <com.habitrpg.android.habitica.ui.AvatarView
                 android:id="@+id/avatarView"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
index 69991baee..a110b1bf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
@@ -9,7 +9,9 @@ import android.graphics.Bitmap;
 import android.media.Image;
 import android.os.Environment;
 import android.support.v7.preference.PreferenceManager;
+import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
@@ -110,14 +112,21 @@ public class QrCodeManager {
             return;
         }
 
+        int qrCodeSize = (int)dipToPixels(400.0f);
+
         Bitmap myBitmap = QRCode.from(this.content)
                 .withErrorCorrection(ErrorCorrectionLevel.H)
-                .withColor(0xFF432874, 0x00FFFFFF)
-                .withSize(400, 400)
+                .withColor(0xFF432874, 0xFFFFFFFF)
+                .withSize(qrCodeSize, qrCodeSize)
                 .bitmap();
         qrCodeImageView.setImageBitmap(myBitmap);
     }
 
+    public float dipToPixels(float dipValue) {
+        DisplayMetrics metrics = this.context.getResources().getDisplayMetrics();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dipValue, metrics);
+    }
+
     public void setDownloadQr() {
         if (qrCodeDownloadButton == null) {
             return;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 7a3041e66..60412ada0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -48,11 +48,11 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
     public boolean onPreferenceTreeClick(Preference preference) {
         if (preference.getKey().equals(getString(R.string.SP_user_qr_code))) {
             qrCodeManager.showDialogue();
+        } else {
+            ClipboardManager clipMan = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+            clipMan.setPrimaryClip(ClipData.newPlainText(preference.getKey(), preference.getSummary()));
+            Toast.makeText(getActivity(), "Copied " + preference.getKey() + " to clipboard.", Toast.LENGTH_SHORT).show();
         }
-
-        ClipboardManager clipMan = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-        clipMan.setPrimaryClip(ClipData.newPlainText(preference.getKey(), preference.getSummary()));
-        Toast.makeText(getActivity(), "Copied " + preference.getKey() + " to clipboard.", Toast.LENGTH_SHORT).show();
         return super.onPreferenceTreeClick(preference);
     }
 }