From 4904cbc7b9919e7d0f67650fb4cb5ef6f4fdd840 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Mon, 15 Aug 2016 22:30:59 -0500
Subject: [PATCH] Restyled popup for QR

---
 Habitica/res/layout/fragment_group_info.xml   | 16 ++++-
 Habitica/res/layout/qr_code.xml               | 65 +++++++------------
 Habitica/res/layout/qr_dialogue.xml           |  2 +-
 .../habitica/helpers/QrCodeManager.java       |  2 +-
 4 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 6b4345ce8..37136ff40 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -41,7 +41,21 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include layout="@layout/qr_code" />
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                >
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    style="@style/CardContent">
+
+                    <include layout="@layout/qr_code" />
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
index 30bb06880..f11080ed3 100644
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@@ -12,51 +12,36 @@
         style="@style/SectionTitle"
          />
 
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/CardView.Default"
-        >
+    <FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="200dp"
+        android:id="@+id/qrCodeWrapper">
 
-        <LinearLayout
-            android:orientation="vertical"
+        <ImageView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            style="@style/CardContent">
+            android:id="@+id/QRImageView"
+            android:layout_gravity="center_horizontal" />
 
-            <FrameLayout
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="200dp"
-                android:id="@+id/qrCodeWrapper">
+        <com.habitrpg.android.habitica.ui.AvatarView
+            android:id="@+id/avatarView"
+            android:layout_width="103dp"
+            android:layout_height="90dp"
+            android:layout_gravity="center"
+            />
+    </FrameLayout>
 
-                <ImageView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:id="@+id/QRImageView"
-                    android:layout_gravity="center_horizontal" />
-
-                <com.habitrpg.android.habitica.ui.AvatarView
-                    android:id="@+id/avatarView"
-                    android:layout_width="103dp"
-                    android:layout_height="90dp"
-                    android:layout_gravity="center"
-                    />
-            </FrameLayout>
-
-            <Button
-                android:id="@+id/QRDownloadButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Download"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_margin="20dp"
-                android:layout_gravity="center_horizontal|bottom"
-                />
-
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
+    <Button
+        android:id="@+id/QRDownloadButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Download"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_margin="20dp"
+        android:layout_gravity="center_horizontal|bottom"
+        />
 
 </LinearLayout>
 
diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml
index 77d451a40..6b6039ea4 100644
--- a/Habitica/res/layout/qr_dialogue.xml
+++ b/Habitica/res/layout/qr_dialogue.xml
@@ -8,7 +8,7 @@
 
     <Button
         android:id="@+id/dialogButtonOK"
-        android:layout_width="40dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Ok"
         android:layout_marginTop="5dp"
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 f5e58d20a..497982398 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
@@ -106,7 +106,7 @@ public class QrCodeManager {
             return;
         }
 
-        Bitmap myBitmap = QRCode.from(this.content).bitmap();
+        Bitmap myBitmap = QRCode.from(this.content).withSize(1000, 1000).bitmap();
         qrCodeImageView.setImageBitmap(myBitmap);
     }