From d65212f4d29b63bf4b24de8cc6bcb7133ef6015a Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Tue, 9 Aug 2016 22:24:19 -0500
Subject: [PATCH 01/10] Added qrcode library. Added qr code imageview to
 account details

---
 Habitica/build.gradle                         | 12 +++++-----
 Habitica/res/layout/activity_prefs.xml        | 22 ++++++++++++++-----
 .../habitica/ui/activities/PrefsActivity.java |  7 ++++++
 .../preferences/AccountDetailsFragment.java   | 15 +++++++++++++
 4 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6639214d8..77e1572df 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -81,6 +81,9 @@ dependencies {
     // Image Loading/Caching
     compile 'com.squareup.picasso:picasso:2.5.2'
 
+    //QR Code
+    compile 'com.github.kenglxn.QRGen:android:2.2.0'
+
     // Emojis
     compile 'com.github.viirus:emoji-lib:0.0.3.2'
 
@@ -161,11 +164,6 @@ android {
         release
     }
 
-    dexOptions{
-        javaMaxHeapSize "4g"
-        preDexLibraries = false
-    }
-
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
@@ -206,8 +204,8 @@ android {
     }
     
     dexOptions {
-        preDexLibraries true
-        javaMaxHeapSize "2g" // Use gig increments depending on needs
+        preDexLibraries false
+        javaMaxHeapSize "4g" // Use gig increments depending on needs
         incremental true
     }
 
diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml
index 2b64575b9..b7e45cff2 100644
--- a/Habitica/res/layout/activity_prefs.xml
+++ b/Habitica/res/layout/activity_prefs.xml
@@ -11,12 +11,6 @@
         android:layout_height="match_parent"
         tools:context=".ui.activities.MainActivity">
 
-        <FrameLayout
-            android:id="@+id/fragment_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
         <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -33,4 +27,20 @@
         </android.support.design.widget.AppBarLayout>
 
     </android.support.design.widget.CoordinatorLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:layout_gravity="center" >
+
+    </FrameLayout>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:id="@+id/imageView"
+        android:layout_gravity="center_horizontal|bottom" />
+
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
index 37e2f01d2..376b81040 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
@@ -15,6 +15,8 @@ import android.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.ImageView;
 
 import butterknife.BindView;
 
@@ -24,6 +26,9 @@ public class PrefsActivity extends BaseActivity implements
     @BindView(R.id.toolbar)
     Toolbar toolbar;
 
+    @BindView(R.id.imageView)
+    ImageView qrImageView;
+
     // TODO:
     // This method should be moved to HabiticaApplication
     public static HostConfig fromContext(Context ctx) {
@@ -51,6 +56,8 @@ public class PrefsActivity extends BaseActivity implements
         getSupportFragmentManager().beginTransaction()
                 .add(R.id.fragment_container, new PreferencesFragment())
                 .commit();
+
+        qrImageView.setVisibility(View.VISIBLE);
     }
 
     @Override
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 c4e6db21f..b528deb7e 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
@@ -5,9 +5,15 @@ import com.habitrpg.android.habitica.R;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.support.v7.preference.Preference;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
 import android.widget.Toast;
 
+import net.glxn.qrgen.android.QRCode;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -22,6 +28,15 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
                 findPreference(key).setSummary(preference.getValue().toString());
             }
         }
+
+        displayQRCode();
+    }
+
+    protected void displayQRCode() {
+        Bitmap myBitmap = QRCode.from("www.example.org").bitmap();
+        ImageView myImage = (ImageView) getActivity().findViewById(R.id.imageView);
+        myImage.setVisibility(View.VISIBLE);
+        myImage.setImageBitmap(myBitmap);
     }
 
     protected List<String> getAccountDetailsPreferences() {

From 30b736d9a13a1cddd28cabe841e25466b69a0cf1 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Wed, 10 Aug 2016 17:57:26 -0500
Subject: [PATCH 02/10] Added QR Code to party page if you are not in a party

---
 Habitica/res/layout/activity_prefs.xml        | 30 +++++++++----------
 Habitica/res/layout/fragment_group_info.xml   | 29 +++++++++++++++++-
 .../preferences/AccountDetailsFragment.java   |  2 +-
 .../social/GroupInformationFragment.java      | 24 ++++++++++++++-
 .../fragments/social/party/PartyFragment.java | 18 +++++------
 5 files changed, 76 insertions(+), 27 deletions(-)

diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml
index b7e45cff2..741f661e4 100644
--- a/Habitica/res/layout/activity_prefs.xml
+++ b/Habitica/res/layout/activity_prefs.xml
@@ -6,6 +6,21 @@
              android:layout_height="match_parent"
              tools:context=".ui.activities.PrefsActivity">
 
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:layout_gravity="center" >
+
+    </FrameLayout>
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:id="@+id/imageView"
+        android:layout_gravity="center_horizontal|bottom" />
+
     <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -28,19 +43,4 @@
 
     </android.support.design.widget.CoordinatorLayout>
 
-    <FrameLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:layout_gravity="center" >
-
-    </FrameLayout>
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:id="@+id/imageView"
-        android:layout_gravity="center_horizontal|bottom" />
-
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index f6cbe2ad9..0b5c4d199 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -34,7 +34,6 @@
         android:layout_height="match_parent"
         android:scrollbarSize="3dp"
         android:scrollbarThumbVertical="@color/md_grey_500"
-
         android:scrollbars="vertical">
 
         <LinearLayout
@@ -42,6 +41,34 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Have someone invite you with this QR Code"
+                style="@style/SectionTitle"
+                android:visibility="@{user.party != null ? View.VISIBLE : View.GONE}" />
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                android:visibility="@{user.party != null ? View.VISIBLE : View.GONE}">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    style="@style/CardContent">
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="200dp"
+                        android:id="@+id/QRImageView"
+                        android:layout_gravity="center_horizontal|bottom" />
+
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
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 b528deb7e..292d7f6de 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
@@ -33,7 +33,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
     }
 
     protected void displayQRCode() {
-        Bitmap myBitmap = QRCode.from("www.example.org").bitmap();
+        Bitmap myBitmap = QRCode.from(getString(R.string.SP_userID)).bitmap();
         ImageView myImage = (ImageView) getActivity().findViewById(R.id.imageView);
         myImage.setVisibility(View.VISIBLE);
         myImage.setImageBitmap(myBitmap);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index 371f6b638..45f8b249f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -14,17 +14,22 @@ import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import net.glxn.qrgen.android.QRCode;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -37,10 +42,16 @@ public class GroupInformationFragment extends BaseFragment {
     FragmentGroupInfoBinding viewBinding;
     @Inject
     APIHelper apiHelper;
+
     @BindView(R.id.questMemberView)
     LinearLayout questMemberView;
+
     @BindView(R.id.collectionStats)
     RecyclerView collectionStats;
+
+    @BindView(R.id.QRImageView)
+    ImageView qrImageView;
+
     private View view;
     private Group group;
     private HabitRPGUser user;
@@ -55,7 +66,6 @@ public class GroupInformationFragment extends BaseFragment {
     }
 
     public static GroupInformationFragment newInstance(Group group, HabitRPGUser user) {
-
         Bundle args = new Bundle();
 
         GroupInformationFragment fragment = new GroupInformationFragment();
@@ -74,6 +84,7 @@ public class GroupInformationFragment extends BaseFragment {
 
         viewBinding = DataBindingUtil.bind(view);
         viewBinding.setHideParticipantCard(false);
+
         if (user != null) {
             viewBinding.setUser(user);
         }
@@ -89,6 +100,10 @@ public class GroupInformationFragment extends BaseFragment {
         bossHpBar = DataBindingUtil.bind(view.findViewById(R.id.bossHpBar));
         bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar));
 
+        if (this.group == null) {
+            displayQRCode();
+        }
+
         return view;
     }
 
@@ -292,4 +307,11 @@ public class GroupInformationFragment extends BaseFragment {
         builder.show();
     }
 
+    protected void displayQRCode() {
+        Bitmap myBitmap = QRCode.from(getString(R.string.SP_userID)).bitmap();
+
+        if (qrImageView != null) {
+            qrImageView.setImageBitmap(myBitmap);
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
index 793b4221c..85ce1aa5e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
@@ -78,15 +78,15 @@ public class PartyFragment extends BaseMainFragment {
                     }, throwable -> {
                     });
         } else {
-            AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-                    .setMessage(activity.getString(R.string.no_party_message))
-                    .setNeutralButton(android.R.string.ok, (dialog, which) -> {
-                        activity.getSupportFragmentManager().popBackStackImmediate();
-                    });
-            builder.show();
-            if (tabLayout != null) {
-                tabLayout.removeAllTabs();
-            }
+//            AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+//                    .setMessage(activity.getString(R.string.no_party_message))
+//                    .setNeutralButton(android.R.string.ok, (dialog, which) -> {
+//                        activity.getSupportFragmentManager().popBackStackImmediate();
+//                    });
+//            builder.show();
+//            if (tabLayout != null) {
+//                tabLayout.removeAllTabs();
+//            }
         }
 
 

From d789a50de494a81d13d9fd69e3ac49a75ef61301 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Thu, 11 Aug 2016 17:00:49 -0500
Subject: [PATCH 03/10] Added download button

---
 Habitica/res/layout/fragment_group_info.xml   | 10 +++++
 .../social/GroupInformationFragment.java      | 43 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 0b5c4d199..9169f10f7 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -66,6 +66,16 @@
                         android:id="@+id/QRImageView"
                         android:layout_gravity="center_horizontal|bottom" />
 
+                    <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>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index 45f8b249f..11fccc819 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -24,11 +24,23 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import net.glxn.qrgen.android.QRCode;
+import net.glxn.qrgen.core.image.ImageType;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.FileChannel;
 
 import javax.inject.Inject;
 
@@ -52,6 +64,9 @@ public class GroupInformationFragment extends BaseFragment {
     @BindView(R.id.QRImageView)
     ImageView qrImageView;
 
+    @BindView(R.id.QRDownloadButton)
+    Button qRDownloadButton;
+
     private View view;
     private Group group;
     private HabitRPGUser user;
@@ -313,5 +328,33 @@ public class GroupInformationFragment extends BaseFragment {
         if (qrImageView != null) {
             qrImageView.setImageBitmap(myBitmap);
         }
+
+        if (qRDownloadButton != null) {
+            qRDownloadButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    File path = new File(getActivity().getFilesDir(), "habitrpg-qr-code");
+                    File file = QRCode.from(getString(R.string.SP_userID)).to(ImageType.JPG).file();
+                    file.renameTo(path);
+                    Toast.makeText(getActivity(), "QR code saved at " + path.getPath(),
+                            Toast.LENGTH_LONG).show();
+                }
+            });
+        }
     }
+
+    public static void copyFile(File src, File dst) throws IOException
+    {
+        FileChannel inChannel = new FileInputStream(src).getChannel();
+        FileChannel outChannel = new FileOutputStream(dst).getChannel();
+        try {
+            inChannel.transferTo(0, inChannel.size(), outChannel);
+        } finally {
+            if (inChannel != null)
+                inChannel.close();
+            if (outChannel != null)
+                outChannel.close();
+        }
+    }
+
 }

From 45d9dc2d3561c96d941a1dc180b516a6271e7abd Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Fri, 12 Aug 2016 08:09:31 -0500
Subject: [PATCH 04/10] Added download qr. Added invite by qr.

---
 Habitica/AndroidManifest.xml                  |   3 +-
 Habitica/res/layout/fragment_party_invite.xml |  12 +++
 Habitica/res/layout/qr_code.xml               |   6 ++
 Habitica/res/values/strings.xml               |   6 ++
 .../habitica/helpers/QrCodeManager.java       | 101 ++++++++++++++++++
 .../habitica/ui/activities/MainActivity.java  |   3 +
 .../ui/activities/PartyInviteActivity.java    |  59 +++++++++-
 .../preferences/AccountDetailsFragment.java   |  15 ++-
 .../social/GroupInformationFragment.java      |  53 ++-------
 .../social/party/PartyInviteFragment.java     |   8 ++
 10 files changed, 214 insertions(+), 52 deletions(-)
 create mode 100644 Habitica/res/layout/qr_code.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index b6b3cd25b..66b2ffd57 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -162,4 +162,5 @@
         </provider>
     </application>
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
diff --git a/Habitica/res/layout/fragment_party_invite.xml b/Habitica/res/layout/fragment_party_invite.xml
index 916dc7241..9104bc5da 100644
--- a/Habitica/res/layout/fragment_party_invite.xml
+++ b/Habitica/res/layout/fragment_party_invite.xml
@@ -12,6 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/row_padding"
         style="@style/CardTitle"/>
+
     <LinearLayout
         android:id="@+id/invitationWrapper"
         android:layout_width="match_parent"
@@ -20,6 +21,7 @@
         android:clickable="false"
         android:layout_marginLeft="@dimen/row_padding"
         android:layout_marginRight="@dimen/row_padding" />
+
     <Button
         android:id="@+id/addInviteButton"
         android:layout_width="wrap_content"
@@ -27,5 +29,15 @@
         android:layout_gravity="right"
         android:text="@string/add_invites"
         android:layout_margin="@dimen/row_padding" />
+
+    <Button
+        android:id="@+id/InviteByQR"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Scan a QR Code"
+        style="@style/Widget.AppCompat.Button.Colored"
+        android:layout_margin="20dp"
+        android:layout_gravity="center_horizontal|bottom"
+        />
 </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
new file mode 100644
index 000000000..3509b8411
--- /dev/null
+++ b/Habitica/res/layout/qr_code.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 0aa13106f..af78b9ce0 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -376,4 +376,10 @@ To start, which parts of your life do you want to improve?</string>
     <string name="gems_plural">gold</string>
     <string name="chat_message_copied">Message copied to Clipboard</string>
     <string name="copy_chat_message">Copy to clipboard</string>
+
+    <!-- QR Strings -->
+    <string name="qr_album_name">habitica</string>
+    <string name="qr_file_name"> habitrpg-qr-code.jpg</string>
+    <string name="qr_save_message">QR code saved at </string>
+
 </resources>
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
new file mode 100644
index 000000000..0fef15e74
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
@@ -0,0 +1,101 @@
+package com.habitrpg.android.habitica.helpers;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.media.Image;
+import android.os.Environment;
+import android.support.v7.preference.PreferenceManager;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import com.habitrpg.android.habitica.R;
+
+import net.glxn.qrgen.android.QRCode;
+import net.glxn.qrgen.core.image.ImageType;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * Created by keithholliday on 8/12/16.
+ */
+public class QrCodeManager {
+
+    //@TODO: Allow users to set other content
+    private String content;
+    private Context context;
+
+    private String albumnName;
+    private String fileName;
+    private String saveMessage;
+
+    public QrCodeManager(Context context) {
+        this.context = context;
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
+        String userId = prefs.getString(this.context.getString(R.string.SP_userID), "");
+
+        this.albumnName = this.context.getString(R.string.qr_album_name);
+        this.fileName = this.context.getString(R.string.qr_file_name);
+        this.saveMessage = this.context.getString(R.string.qr_save_message);
+
+        this.content = userId;
+    }
+
+    public void displayQrCode(ImageView qrImageView) {
+        if (qrImageView == null) {
+            return;
+        }
+
+        Bitmap myBitmap = QRCode.from(this.content).bitmap();
+        qrImageView.setImageBitmap(myBitmap);
+    }
+
+    public void downloadQr(Button qRDownloadButton) {
+        if (qRDownloadButton == null) {
+            return;
+        }
+
+        qRDownloadButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                File dir = getAlbumStorageDir(context, albumnName);
+                dir.mkdirs();
+
+                File pathToQRCode = new File(dir, fileName);
+                try {
+                    pathToQRCode.createNewFile();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+
+                ByteArrayOutputStream qrStream = QRCode.from(content).to(ImageType.JPG).stream();
+
+                try {
+                    FileOutputStream outputStream = new FileOutputStream(pathToQRCode);
+                    qrStream.writeTo(outputStream);
+                    outputStream.close();
+
+                    Toast.makeText(context, saveMessage + pathToQRCode.getPath(),
+                            Toast.LENGTH_LONG).show();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    private File getAlbumStorageDir(Context context, String albumName) {
+        // Get the directory for the app's private pictures directory.
+        File file = new File(context.getExternalFilesDir(
+                Environment.DIRECTORY_PICTURES), albumName);
+        file.mkdirs();
+        return file;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index bb81fb7a7..9b87bd05a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -33,6 +33,8 @@ import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.TutorialView;
@@ -124,6 +126,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
index f1c108c4b..3f9c41b38 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
@@ -1,8 +1,13 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -11,20 +16,34 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
 
 import butterknife.BindView;
 
-public class PartyInviteActivity extends BaseActivity {
+public class PartyInviteActivity extends BaseActivity implements HabitRPGUserCallback.OnUserReceived {
 
     public static final int RESULT_SEND_INVITES = 100;
     public static final String USER_IDS_KEY = "userIDs";
     public static final String IS_EMAIL_KEY = "isEmail";
     public static final String EMAILS_KEY = "emails";
+
+    private HabitRPGUser user;
+    private String userIdToInvite;
+
+    @Inject
+    APIHelper apiHelper;
+
     @BindView(R.id.tab_layout)
     TabLayout tabLayout;
 
@@ -129,4 +148,42 @@ public class PartyInviteActivity extends BaseActivity {
             tabLayout.setupWithViewPager(viewPager);
         }
     }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        IntentResult scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+
+        if (scanningResult != null) {
+            userIdToInvite = scanningResult.getContents();
+
+            //@TODO: Inject the user
+            this.apiHelper.apiService.getUser()
+                    .compose(this.apiHelper.configureApiCallObserver())
+                    .subscribe(new HabitRPGUserCallback(this), throwable -> {});
+
+        }
+    }
+
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        this.user = user;
+
+
+        Toast toast = Toast.makeText(getApplicationContext(),
+                userIdToInvite, Toast.LENGTH_SHORT);
+        toast.show();
+
+        Map<String, Object> inviteData = new HashMap<>();
+        List<String> invites = new ArrayList<>();
+        invites.add(userIdToInvite);
+        inviteData.put("uuids", invites);
+
+        this.apiHelper.apiService.inviteToGroup(this.user.getParty().getId(), inviteData)
+                .compose(apiHelper.configureApiCallObserver())
+                .subscribe(aVoid -> {
+                }, throwable -> {
+                });
+    }
 }
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 292d7f6de..978f139ef 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
@@ -1,12 +1,15 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.helpers.QrCodeManager;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
@@ -29,14 +32,10 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
             }
         }
 
-        displayQRCode();
-    }
-
-    protected void displayQRCode() {
-        Bitmap myBitmap = QRCode.from(getString(R.string.SP_userID)).bitmap();
-        ImageView myImage = (ImageView) getActivity().findViewById(R.id.imageView);
-        myImage.setVisibility(View.VISIBLE);
-        myImage.setImageBitmap(myBitmap);
+        ImageView qrImageView = (ImageView) getActivity().findViewById(R.id.imageView);
+        QrCodeManager qrCodeManager = new QrCodeManager(this.getContext());
+        qrCodeManager.displayQrCode(qrImageView);
+//        qrCodeManager.downloadQr(qRDownloadButton);
     }
 
     protected List<String> getAccountDetailsPreferences() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index 11fccc819..93eea3e01 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -5,6 +5,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.databinding.FragmentGroupInfoBinding;
 import com.habitrpg.android.habitica.databinding.ValueBarBinding;
+import com.habitrpg.android.habitica.helpers.QrCodeManager;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.ui.adapter.social.QuestCollectRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
@@ -13,11 +15,15 @@ import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
 
 import android.app.AlertDialog;
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 import android.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.os.Bundle;
+import android.os.Environment;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.preference.PreferenceManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -33,14 +39,10 @@ import android.widget.Toast;
 import net.glxn.qrgen.android.QRCode;
 import net.glxn.qrgen.core.image.ImageType;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.channels.FileChannel;
 
 import javax.inject.Inject;
 
@@ -52,6 +54,7 @@ public class GroupInformationFragment extends BaseFragment {
 
 
     FragmentGroupInfoBinding viewBinding;
+
     @Inject
     APIHelper apiHelper;
 
@@ -116,7 +119,9 @@ public class GroupInformationFragment extends BaseFragment {
         bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar));
 
         if (this.group == null) {
-            displayQRCode();
+            QrCodeManager qrCodeManager = new QrCodeManager(this.getContext());
+            qrCodeManager.displayQrCode(qrImageView);
+            qrCodeManager.downloadQr(qRDownloadButton);
         }
 
         return view;
@@ -321,40 +326,4 @@ public class GroupInformationFragment extends BaseFragment {
                 });
         builder.show();
     }
-
-    protected void displayQRCode() {
-        Bitmap myBitmap = QRCode.from(getString(R.string.SP_userID)).bitmap();
-
-        if (qrImageView != null) {
-            qrImageView.setImageBitmap(myBitmap);
-        }
-
-        if (qRDownloadButton != null) {
-            qRDownloadButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    File path = new File(getActivity().getFilesDir(), "habitrpg-qr-code");
-                    File file = QRCode.from(getString(R.string.SP_userID)).to(ImageType.JPG).file();
-                    file.renameTo(path);
-                    Toast.makeText(getActivity(), "QR code saved at " + path.getPath(),
-                            Toast.LENGTH_LONG).show();
-                }
-            });
-        }
-    }
-
-    public static void copyFile(File src, File dst) throws IOException
-    {
-        FileChannel inChannel = new FileInputStream(src).getChannel();
-        FileChannel outChannel = new FileOutputStream(dst).getChannel();
-        try {
-            inChannel.transferTo(0, inChannel.size(), outChannel);
-        } finally {
-            if (inChannel != null)
-                inChannel.close();
-            if (outChannel != null)
-                outChannel.close();
-        }
-    }
-
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java
index 72fba720d..dea24400a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.social.party;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 
 import android.os.Bundle;
@@ -57,6 +58,7 @@ public class PartyInviteFragment extends BaseFragment {
     @OnClick(R.id.addInviteButton)
     public void addInviteField() {
         EditText editText = new EditText(getContext());
+
         if (isEmailInvite) {
             editText.setHint(R.string.email);
             editText.setInputType(InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
@@ -66,6 +68,12 @@ public class PartyInviteFragment extends BaseFragment {
         invitationWrapper.addView(editText);
     }
 
+    @OnClick(R.id.InviteByQR)
+    public void startQRInvite() {
+        IntentIntegrator scanIntegrator = new IntentIntegrator(getActivity());
+        scanIntegrator.initiateScan();
+    }
+
     public String[] getValues() {
         List<String> values = new ArrayList<>();
         for (int i = 0; i < invitationWrapper.getChildCount(); i++) {

From 796a9a76131293b919a075fefdde88f4be6458ef Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Fri, 12 Aug 2016 10:10:04 -0500
Subject: [PATCH 05/10] Refactored QR code and fixed layout issues

---
 Habitica/res/layout/activity_prefs.xml        | 15 ++--
 Habitica/res/layout/fragment_group_info.xml   | 38 +----------
 Habitica/res/layout/qr_code.xml               | 60 +++++++++++++++-
 .../habitica/helpers/QrCodeManager.java       | 68 ++++++++++++++++---
 .../habitica/ui/activities/PrefsActivity.java | 13 +++-
 .../preferences/AccountDetailsFragment.java   | 11 +--
 .../social/GroupInformationFragment.java      | 16 ++---
 7 files changed, 151 insertions(+), 70 deletions(-)

diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml
index 741f661e4..c57d7a30a 100644
--- a/Habitica/res/layout/activity_prefs.xml
+++ b/Habitica/res/layout/activity_prefs.xml
@@ -11,20 +11,23 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        android:layout_gravity="center" >
+        android:layout_gravity="top|center" >
 
     </FrameLayout>
 
-    <ImageView
+    <LinearLayout
+        android:id="@+id/qrLinearLayout"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:id="@+id/imageView"
-        android:layout_gravity="center_horizontal|bottom" />
+        android:layout_height="350dp"
+        android:layout_gravity="center">
+        <include layout="@layout/qr_code" />
+    </LinearLayout>
 
     <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.activities.MainActivity">
+        tools:context=".ui.activities.MainActivity"
+        android:layout_gravity="center_horizontal|bottom">
 
         <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 9169f10f7..6b4345ce8 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -41,43 +41,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Have someone invite you with this QR Code"
-                style="@style/SectionTitle"
-                android:visibility="@{user.party != null ? View.VISIBLE : View.GONE}" />
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default"
-                android:visibility="@{user.party != null ? View.VISIBLE : View.GONE}">
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    style="@style/CardContent">
-
-                    <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="200dp"
-                        android:id="@+id/QRImageView"
-                        android:layout_gravity="center_horizontal|bottom" />
-
-                    <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>
+            <include layout="@layout/qr_code" />
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
index 3509b8411..8b227a40e 100644
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@@ -1,6 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:id="@+id/qrLayout"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-</LinearLayout>
\ No newline at end of file
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Have someone invite you with this QR Code"
+        style="@style/SectionTitle"
+         />
+
+    <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">
+
+            <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">
+
+                <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>
+
+</LinearLayout>
+
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 0fef15e74..4ff3d8eff 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,10 +9,18 @@ import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
+import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
 
 import net.glxn.qrgen.android.QRCode;
 import net.glxn.qrgen.core.image.ImageType;
@@ -31,11 +39,33 @@ public class QrCodeManager {
     private String content;
     private Context context;
 
+    private ImageView qrCodeImageView;
+    private Button qrCodeDownloadButton;
+    private AvatarView avatarView;
+    private FrameLayout qrCodeWrapper;
+
     private String albumnName;
     private String fileName;
     private String saveMessage;
 
-    public QrCodeManager(Context context) {
+    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
+        @Override
+        public void onResultReceived(HabitRPGUser habitRPGUser) {
+            QrCodeManager.this.avatarView.setUser(habitRPGUser);
+        }
+
+        @Override
+        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
+            return true;
+        }
+
+        @Override
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+            return true;
+        }
+    };
+
+    public QrCodeManager(Context context, LinearLayout qrLayout) {
         this.context = context;
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
@@ -45,24 +75,40 @@ public class QrCodeManager {
         this.fileName = this.context.getString(R.string.qr_file_name);
         this.saveMessage = this.context.getString(R.string.qr_save_message);
 
+        this.qrCodeImageView = (ImageView) qrLayout.findViewById(R.id.QRImageView);
+        this.qrCodeDownloadButton = (Button) qrLayout.findViewById(R.id.QRDownloadButton);
+        this.avatarView = (AvatarView) qrLayout.findViewById(R.id.avatarView);
+        this.qrCodeWrapper = (FrameLayout) qrLayout.findViewById(R.id.qrCodeWrapper);
+
         this.content = userId;
+
+        //@TODO: Move to user helper/model
+        new Select()
+                .from(HabitRPGUser.class)
+                .where(Condition.column("id")
+                .eq(userId))
+                .async()
+                .querySingle(userTransactionListener);
+
+        this.displayQrCode();
+        this.setDownloadQr();
     }
 
-    public void displayQrCode(ImageView qrImageView) {
-        if (qrImageView == null) {
+    public void displayQrCode() {
+        if (qrCodeImageView == null) {
             return;
         }
 
         Bitmap myBitmap = QRCode.from(this.content).bitmap();
-        qrImageView.setImageBitmap(myBitmap);
+        qrCodeImageView.setImageBitmap(myBitmap);
     }
 
-    public void downloadQr(Button qRDownloadButton) {
-        if (qRDownloadButton == null) {
+    public void setDownloadQr() {
+        if (qrCodeDownloadButton == null) {
             return;
         }
 
-        qRDownloadButton.setOnClickListener(new View.OnClickListener() {
+        qrCodeDownloadButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 File dir = getAlbumStorageDir(context, albumnName);
@@ -75,11 +121,13 @@ public class QrCodeManager {
                     e.printStackTrace();
                 }
 
-                ByteArrayOutputStream qrStream = QRCode.from(content).to(ImageType.JPG).stream();
-
                 try {
                     FileOutputStream outputStream = new FileOutputStream(pathToQRCode);
-                    qrStream.writeTo(outputStream);
+
+                    qrCodeWrapper.setDrawingCacheEnabled(true);
+                    Bitmap b = qrCodeWrapper.getDrawingCache();
+                    b.compress(Bitmap.CompressFormat.JPEG, 95, outputStream);
+
                     outputStream.close();
 
                     Toast.makeText(context, saveMessage + pathToQRCode.getPath(),
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
index 376b81040..45044bd98 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
@@ -17,6 +17,7 @@ import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import butterknife.BindView;
 
@@ -26,8 +27,8 @@ public class PrefsActivity extends BaseActivity implements
     @BindView(R.id.toolbar)
     Toolbar toolbar;
 
-    @BindView(R.id.imageView)
-    ImageView qrImageView;
+    @BindView(R.id.qrLinearLayout)
+    LinearLayout qrLinearLayout;
 
     // TODO:
     // This method should be moved to HabiticaApplication
@@ -57,7 +58,13 @@ public class PrefsActivity extends BaseActivity implements
                 .add(R.id.fragment_container, new PreferencesFragment())
                 .commit();
 
-        qrImageView.setVisibility(View.VISIBLE);
+        qrLinearLayout.setVisibility(View.INVISIBLE);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        qrLinearLayout.setVisibility(View.INVISIBLE);
     }
 
     @Override
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 978f139ef..e70b017f0 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
@@ -12,7 +12,9 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
+import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import net.glxn.qrgen.android.QRCode;
@@ -32,10 +34,11 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
             }
         }
 
-        ImageView qrImageView = (ImageView) getActivity().findViewById(R.id.imageView);
-        QrCodeManager qrCodeManager = new QrCodeManager(this.getContext());
-        qrCodeManager.displayQrCode(qrImageView);
-//        qrCodeManager.downloadQr(qRDownloadButton);
+        LinearLayout qrLinearLayout = (LinearLayout) getActivity().findViewById(R.id.qrLinearLayout);
+        qrLinearLayout.setVisibility(View.VISIBLE);
+
+        LinearLayout qrLayout = (LinearLayout) getActivity().findViewById(R.id.qrLayout);
+        QrCodeManager qrCodeManager = new QrCodeManager(this.getContext(), qrLayout);
     }
 
     protected List<String> getAccountDetailsPreferences() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index 93eea3e01..e2170dcb5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -7,6 +7,7 @@ import com.habitrpg.android.habitica.databinding.FragmentGroupInfoBinding;
 import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.helpers.QrCodeManager;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.adapter.social.QuestCollectRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
@@ -64,11 +65,8 @@ public class GroupInformationFragment extends BaseFragment {
     @BindView(R.id.collectionStats)
     RecyclerView collectionStats;
 
-    @BindView(R.id.QRImageView)
-    ImageView qrImageView;
-
-    @BindView(R.id.QRDownloadButton)
-    Button qRDownloadButton;
+    @BindView(R.id.qrLayout)
+    LinearLayout qrLayout;
 
     private View view;
     private Group group;
@@ -119,9 +117,11 @@ public class GroupInformationFragment extends BaseFragment {
         bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar));
 
         if (this.group == null) {
-            QrCodeManager qrCodeManager = new QrCodeManager(this.getContext());
-            qrCodeManager.displayQrCode(qrImageView);
-            qrCodeManager.downloadQr(qRDownloadButton);
+            new QrCodeManager(this.getContext(), qrLayout);
+        }
+
+        if (user.getParty().getId() != null) {
+            ((ViewGroup) qrLayout.getParent()).removeView(qrLayout);
         }
 
         return view;

From e0632ee6e2b615b0dfb82da73c836bd9afcd39f7 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Fri, 12 Aug 2016 11:27:24 -0500
Subject: [PATCH 06/10] Updated test to mod 7 for the days of the week

---
 .../android/habitica/helpers/TaskAlarmManagerTest.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
index db001d465..ea0487a46 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
@@ -316,7 +316,10 @@ public class TaskAlarmManagerTest {
 
         Assert.assertNotNull(alarmId);
         Assert.assertEquals(true, alarmUp);
-        Assert.assertEquals(currentDayOfTheWeek + everyXDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
+
+        int expectedDay = (currentDayOfTheWeek + everyXDay) % 7;
+
+        Assert.assertEquals(expectedDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
     }
 
     @Test
@@ -358,6 +361,9 @@ public class TaskAlarmManagerTest {
 
         Assert.assertNotNull(alarmId);
         Assert.assertEquals(true, alarmUp);
-        Assert.assertEquals(currentDayOfTheWeek + everyXDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
+
+        int expectedDay = (currentDayOfTheWeek + everyXDay) % 7;
+
+        Assert.assertEquals(expectedDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
     }
 }

From 4bc2ace8f24f0b3a79f87e5bdfb6b93ef2f50894 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Fri, 12 Aug 2016 14:27:06 -0500
Subject: [PATCH 07/10] Added configure method for avaterview. Added dialgoue
 in preferences for qr code

---
 Habitica/res/layout/activity_prefs.xml        |  8 -----
 Habitica/res/layout/qr_code.xml               |  2 +-
 Habitica/res/layout/qr_dialogue.xml           | 19 +++++++++++
 Habitica/res/values/strings.xml               |  2 ++
 Habitica/res/xml/preferences_fragment.xml     |  8 +++++
 .../habitica/helpers/QrCodeManager.java       | 34 ++++++++++++++++---
 .../android/habitica/ui/AvatarView.java       |  6 ++++
 .../habitica/ui/activities/PrefsActivity.java | 11 ------
 .../preferences/AccountDetailsFragment.java   | 16 +++++----
 .../social/GroupInformationFragment.java      |  3 +-
 10 files changed, 78 insertions(+), 31 deletions(-)
 create mode 100644 Habitica/res/layout/qr_dialogue.xml

diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml
index c57d7a30a..4bb3134f1 100644
--- a/Habitica/res/layout/activity_prefs.xml
+++ b/Habitica/res/layout/activity_prefs.xml
@@ -15,14 +15,6 @@
 
     </FrameLayout>
 
-    <LinearLayout
-        android:id="@+id/qrLinearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="350dp"
-        android:layout_gravity="center">
-        <include layout="@layout/qr_code" />
-    </LinearLayout>
-
     <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
index 8b227a40e..30bb06880 100644
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical"
     android:id="@+id/qrLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml
new file mode 100644
index 000000000..bbb991fa8
--- /dev/null
+++ b/Habitica/res/layout/qr_dialogue.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+
+    <include
+        layout="@layout/qr_code" />
+
+    <Button
+        android:id="@+id/dialogButtonOK"
+        android:layout_width="40dp"
+        android:layout_height="wrap_content"
+        android:text="Ok"
+        android:layout_marginTop="5dp"
+        android:layout_marginRight="5dp"
+        android:layout_below="@+id/qrLayout"
+        />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index af78b9ce0..8fd2f9673 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="SP_userID_summary">Your User ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Your API Token</string>
+    <string name="SP_user_qr_code">Your QR Code</string>
     <string name="PS_contact_title">Contact me</string>
     <string name="unknown_error">An error happened…</string>
     <string name="pref_account_header">Account</string>
@@ -381,5 +382,6 @@ To start, which parts of your life do you want to improve?</string>
     <string name="qr_album_name">habitica</string>
     <string name="qr_file_name"> habitrpg-qr-code.jpg</string>
     <string name="qr_save_message">QR code saved at </string>
+    <string name="qr_dialogue_title">Your QR Code</string>
 
 </resources>
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index 46d5b2e1b..1d50cc370 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -46,6 +46,14 @@
                     android:shouldDisableView="false"
                     android:summary="@string/SP_APIToken_summary"/>
 
+                <Preference
+                    android:key="@string/SP_user_qr_code"
+                    android:title="@string/SP_user_qr_code"
+                    android:selectable="true"
+                    android:persistent="false"
+                    android:shouldDisableView="false"
+                    android:summary="@string/SP_user_qr_code"/>
+
             </PreferenceCategory>
 
         </PreferenceScreen>
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 4ff3d8eff..f5e58d20a 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
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.helpers;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
@@ -12,6 +13,7 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.habitrpg.android.habitica.R;
@@ -37,6 +39,7 @@ public class QrCodeManager {
 
     //@TODO: Allow users to set other content
     private String content;
+    private String userId;
     private Context context;
 
     private ImageView qrCodeImageView;
@@ -65,7 +68,7 @@ public class QrCodeManager {
         }
     };
 
-    public QrCodeManager(Context context, LinearLayout qrLayout) {
+    public QrCodeManager(Context context) {
         this.context = context;
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
@@ -75,18 +78,22 @@ public class QrCodeManager {
         this.fileName = this.context.getString(R.string.qr_file_name);
         this.saveMessage = this.context.getString(R.string.qr_save_message);
 
+        this.content = userId;
+        this.userId = userId;
+    }
+
+    public void setUpView(LinearLayout qrLayout) {
         this.qrCodeImageView = (ImageView) qrLayout.findViewById(R.id.QRImageView);
         this.qrCodeDownloadButton = (Button) qrLayout.findViewById(R.id.QRDownloadButton);
         this.avatarView = (AvatarView) qrLayout.findViewById(R.id.avatarView);
+        this.avatarView.configureView(false, false, false);
         this.qrCodeWrapper = (FrameLayout) qrLayout.findViewById(R.id.qrCodeWrapper);
 
-        this.content = userId;
-
         //@TODO: Move to user helper/model
         new Select()
                 .from(HabitRPGUser.class)
                 .where(Condition.column("id")
-                .eq(userId))
+                        .eq(userId))
                 .async()
                 .querySingle(userTransactionListener);
 
@@ -146,4 +153,23 @@ public class QrCodeManager {
         file.mkdirs();
         return file;
     }
+
+    public void showDialogue() {
+        final Dialog dialog = new Dialog(context);
+        dialog.setContentView(R.layout.qr_dialogue);
+        dialog.setTitle(R.string.qr_dialogue_title);
+
+        LinearLayout qrLayout = (LinearLayout) dialog.findViewById(R.id.qrLayout);
+        this.setUpView(qrLayout);
+        Button dialogButton = (Button) dialog.findViewById(R.id.dialogButtonOK);
+
+        dialogButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        dialog.show();
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
index 9b61869f4..be5f001d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
@@ -91,6 +91,12 @@ public class AvatarView extends View {
         isOrphan = true;
     }
 
+    public void configureView(boolean showBackground, boolean showMount, boolean showPet) {
+        this.showBackground = showBackground;
+        this.showMount = showMount;
+        this.showPet = showPet;
+    }
+
     private void init(AttributeSet attrs, int defStyle) {
         // Load attributes
         final TypedArray a = getContext().obtainStyledAttributes(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
index 45044bd98..454bf3be4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
@@ -27,9 +27,6 @@ public class PrefsActivity extends BaseActivity implements
     @BindView(R.id.toolbar)
     Toolbar toolbar;
 
-    @BindView(R.id.qrLinearLayout)
-    LinearLayout qrLinearLayout;
-
     // TODO:
     // This method should be moved to HabiticaApplication
     public static HostConfig fromContext(Context ctx) {
@@ -57,14 +54,6 @@ public class PrefsActivity extends BaseActivity implements
         getSupportFragmentManager().beginTransaction()
                 .add(R.id.fragment_container, new PreferencesFragment())
                 .commit();
-
-        qrLinearLayout.setVisibility(View.INVISIBLE);
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        qrLinearLayout.setVisibility(View.INVISIBLE);
     }
 
     @Override
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 e70b017f0..051c8de02 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
@@ -25,6 +25,8 @@ import java.util.Map;
 
 public class AccountDetailsFragment extends BasePreferencesFragment {
 
+    private QrCodeManager qrCodeManager;
+
     @Override
     protected void setupPreferences() {
         for (Map.Entry<String, ?> preference : getPreferenceScreen().getSharedPreferences().getAll().entrySet()) {
@@ -34,20 +36,22 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
             }
         }
 
-        LinearLayout qrLinearLayout = (LinearLayout) getActivity().findViewById(R.id.qrLinearLayout);
-        qrLinearLayout.setVisibility(View.VISIBLE);
-
-        LinearLayout qrLayout = (LinearLayout) getActivity().findViewById(R.id.qrLayout);
-        QrCodeManager qrCodeManager = new QrCodeManager(this.getContext(), qrLayout);
+        qrCodeManager = new QrCodeManager(this.getContext());
     }
 
     protected List<String> getAccountDetailsPreferences() {
         return Arrays.asList(getString(R.string.SP_username), getString(R.string.SP_email),
-                getString(R.string.SP_APIToken), getString(R.string.SP_userID));
+                getString(R.string.SP_APIToken), getString(R.string.SP_userID), getString(R.string.SP_user_qr_code));
     }
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
+
+        Log.v("keith",  preference.getKey());
+        if (preference.getKey().equals(getString(R.string.SP_user_qr_code))) {
+            qrCodeManager.showDialogue();
+        }
+
         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();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index e2170dcb5..074bcf879 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -117,7 +117,8 @@ public class GroupInformationFragment extends BaseFragment {
         bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar));
 
         if (this.group == null) {
-            new QrCodeManager(this.getContext(), qrLayout);
+            QrCodeManager qrCodeManager = new QrCodeManager(this.getContext());
+            qrCodeManager.setUpView(qrLayout);
         }
 
         if (user.getParty().getId() != null) {

From 9ed527378c96437adac782156861203b4cc35b0a Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Fri, 12 Aug 2016 14:37:07 -0500
Subject: [PATCH 08/10] Quried the user from the database rather than the api

---
 Habitica/res/layout/qr_dialogue.xml           |  1 +
 .../ui/activities/PartyInviteActivity.java    | 41 +++++++++++++++----
 .../preferences/AccountDetailsFragment.java   |  2 -
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml
index bbb991fa8..77d451a40 100644
--- a/Habitica/res/layout/qr_dialogue.xml
+++ b/Habitica/res/layout/qr_dialogue.xml
@@ -13,6 +13,7 @@
         android:text="Ok"
         android:layout_marginTop="5dp"
         android:layout_marginRight="5dp"
+        android:layout_centerHorizontal="true"
         android:layout_below="@+id/qrLayout"
         />
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
index 3f9c41b38..307b7913a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.activities;
 
 import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -8,6 +9,10 @@ import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
+import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -31,7 +36,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 
-public class PartyInviteActivity extends BaseActivity implements HabitRPGUserCallback.OnUserReceived {
+public class PartyInviteActivity extends BaseActivity {
 
     public static final int RESULT_SEND_INVITES = 100;
     public static final String USER_IDS_KEY = "userIDs";
@@ -44,6 +49,9 @@ public class PartyInviteActivity extends BaseActivity implements HabitRPGUserCal
     @Inject
     APIHelper apiHelper;
 
+    @Inject
+    protected HostConfig hostConfig;
+
     @BindView(R.id.tab_layout)
     TabLayout tabLayout;
 
@@ -52,6 +60,23 @@ public class PartyInviteActivity extends BaseActivity implements HabitRPGUserCal
 
     List<PartyInviteFragment> fragments = new ArrayList<>();
 
+    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
+        @Override
+        public void onResultReceived(HabitRPGUser habitRPGUser) {
+            handleUserRecieved(habitRPGUser);
+        }
+
+        @Override
+        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
+            return true;
+        }
+
+        @Override
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+            return true;
+        }
+    };
+
     @Override
     protected int getLayoutResId() {
         return R.layout.activity_party_invite;
@@ -158,21 +183,21 @@ public class PartyInviteActivity extends BaseActivity implements HabitRPGUserCal
         if (scanningResult != null) {
             userIdToInvite = scanningResult.getContents();
 
-            //@TODO: Inject the user
-            this.apiHelper.apiService.getUser()
-                    .compose(this.apiHelper.configureApiCallObserver())
-                    .subscribe(new HabitRPGUserCallback(this), throwable -> {});
+            //@TODO: Move to user helper/model
+            new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);
 
         }
     }
 
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
+    public void handleUserRecieved(HabitRPGUser user) {
         this.user = user;
 
+        if (this.userIdToInvite == null) {
+            return;
+        }
 
         Toast toast = Toast.makeText(getApplicationContext(),
-                userIdToInvite, Toast.LENGTH_SHORT);
+                "Invited: " + userIdToInvite, Toast.LENGTH_SHORT);
         toast.show();
 
         Map<String, Object> inviteData = new HashMap<>();
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 051c8de02..7a3041e66 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
@@ -46,8 +46,6 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
-
-        Log.v("keith",  preference.getKey());
         if (preference.getKey().equals(getString(R.string.SP_user_qr_code))) {
             qrCodeManager.showDialogue();
         }

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 09/10] 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);
     }
 

From 9762dc3a048f252b07e347bbba6fa348a2de61fe Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@gmail.com>
Date: Tue, 16 Aug 2016 20:17:18 -0500
Subject: [PATCH 10/10] Fixed styles. Made QR code purple. Encoded url to QR
 code. Made QR code larger

---
 Habitica/res/layout/fragment_group_info.xml   |  1 +
 Habitica/res/layout/qr_code.xml               | 30 +++++++++++++------
 Habitica/res/values/strings.xml               |  1 +
 .../habitica/helpers/QrCodeManager.java       |  7 +++--
 .../ui/activities/PartyInviteActivity.java    | 13 +++++---
 .../social/GroupInformationFragment.java      |  8 +++--
 6 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 37136ff40..136822d1a 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -45,6 +45,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/CardView.Default"
+                android:id="@+id/qrWrapper"
                 >
 
                 <LinearLayout
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
index f11080ed3..4711c3aef 100644
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@@ -8,29 +8,41 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Have someone invite you with this QR Code"
+        android:text="@string/qr_section_title"
         style="@style/SectionTitle"
+        android:layout_gravity="center"
          />
 
     <FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="fill_parent"
-        android:layout_height="200dp"
+        android:layout_height="300dp"
         android:id="@+id/qrCodeWrapper">
 
         <ImageView
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:id="@+id/QRImageView"
-            android:layout_gravity="center_horizontal" />
+            android:layout_gravity="center" />
 
-        <com.habitrpg.android.habitica.ui.AvatarView
-            android:id="@+id/avatarView"
-            android:layout_width="103dp"
-            android:layout_height="90dp"
+        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="vertical"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_gravity="center"
-            />
+            android:background="@color/transparent"
+            android:clipChildren="true"
+            android:padding="0dp"
+            >
+            <com.habitrpg.android.habitica.ui.AvatarView
+                android:id="@+id/avatarView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                />
+        </RelativeLayout>
     </FrameLayout>
 
     <Button
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 8fd2f9673..9d00f17f3 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -379,6 +379,7 @@ To start, which parts of your life do you want to improve?</string>
     <string name="copy_chat_message">Copy to clipboard</string>
 
     <!-- QR Strings -->
+    <string name="qr_section_title">Have someone invite you with this QR Code</string>
     <string name="qr_album_name">habitica</string>
     <string name="qr_file_name"> habitrpg-qr-code.jpg</string>
     <string name="qr_save_message">QR code saved at </string>
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 497982398..136e6809f 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
@@ -19,6 +19,7 @@ import android.widget.Toast;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.mikepenz.materialize.color.Material;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
@@ -41,6 +42,7 @@ public class QrCodeManager {
     private String content;
     private String userId;
     private Context context;
+    private String qrProfileUrl = "https://habitica.com/qr-code/user/";
 
     private ImageView qrCodeImageView;
     private Button qrCodeDownloadButton;
@@ -78,7 +80,7 @@ public class QrCodeManager {
         this.fileName = this.context.getString(R.string.qr_file_name);
         this.saveMessage = this.context.getString(R.string.qr_save_message);
 
-        this.content = userId;
+        this.content = this.qrProfileUrl + userId;
         this.userId = userId;
     }
 
@@ -106,7 +108,7 @@ public class QrCodeManager {
             return;
         }
 
-        Bitmap myBitmap = QRCode.from(this.content).withSize(1000, 1000).bitmap();
+        Bitmap myBitmap = QRCode.from(this.content).withColor(0xFF432874, 0xFFFFFFFF).withSize(400, 400).bitmap();
         qrCodeImageView.setImageBitmap(myBitmap);
     }
 
@@ -130,7 +132,6 @@ public class QrCodeManager {
 
                 try {
                     FileOutputStream outputStream = new FileOutputStream(pathToQRCode);
-
                     qrCodeWrapper.setDrawingCacheEnabled(true);
                     Bitmap b = qrCodeWrapper.getDrawingCache();
                     b.compress(Bitmap.CompressFormat.JPEG, 95, outputStream);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
index 307b7913a..937b4bc95 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.java
@@ -16,6 +16,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
@@ -180,12 +181,16 @@ public class PartyInviteActivity extends BaseActivity {
 
         IntentResult scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
 
-        if (scanningResult != null) {
-            userIdToInvite = scanningResult.getContents();
+        if (scanningResult != null && scanningResult.getContents() != null) {
+            String qrCodeUrl = scanningResult.getContents();
+            Uri uri = Uri.parse(qrCodeUrl);
+            if (uri == null || uri.getPathSegments().size() < 3) {
+                return;
+            }
+            userIdToInvite = uri.getPathSegments().get(2);
 
             //@TODO: Move to user helper/model
             new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);
-
         }
     }
 
@@ -197,7 +202,7 @@ public class PartyInviteActivity extends BaseActivity {
         }
 
         Toast toast = Toast.makeText(getApplicationContext(),
-                "Invited: " + userIdToInvite, Toast.LENGTH_SHORT);
+                "Invited: " + userIdToInvite, Toast.LENGTH_LONG);
         toast.show();
 
         Map<String, Object> inviteData = new HashMap<>();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
index 074bcf879..7b1141cf8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -25,6 +25,7 @@ import android.os.Environment;
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.preference.PreferenceManager;
+import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -68,6 +69,9 @@ public class GroupInformationFragment extends BaseFragment {
     @BindView(R.id.qrLayout)
     LinearLayout qrLayout;
 
+    @BindView(R.id.qrWrapper)
+    CardView qrWrapper;
+
     private View view;
     private Group group;
     private HabitRPGUser user;
@@ -121,8 +125,8 @@ public class GroupInformationFragment extends BaseFragment {
             qrCodeManager.setUpView(qrLayout);
         }
 
-        if (user.getParty().getId() != null) {
-            ((ViewGroup) qrLayout.getParent()).removeView(qrLayout);
+        if (user != null && user.getParty().getId() != null) {
+            ((ViewGroup) qrWrapper.getParent()).removeView(qrWrapper);
         }
 
         return view;