From 45d9dc2d3561c96d941a1dc180b516a6271e7abd Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Fri, 12 Aug 2016 08:09:31 -0500 Subject: [PATCH] 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 @@ - + @@ -162,4 +162,5 @@ + 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"/> + +