From edc62302a225e2ce763a40f2a1de3bc1fd38565b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 7 Oct 2019 18:35:08 +0200
Subject: [PATCH] Implement gifting gems

---
 Habitica/AndroidManifest.xml                  |   6 +-
 .../res/drawable-xhdpi/icon_gift_gems.png     | Bin 0 -> 5101 bytes
 .../drawable-xhdpi/icon_gift_subscription.png | Bin 0 -> 4934 bytes
 Habitica/res/drawable-xhdpi/icon_messages.png | Bin 0 -> 3719 bytes
 .../drawable/layout_rounded_bg_light_gray.xml |   2 +-
 Habitica/res/layout/activity_full_profile.xml |  47 ++++-
 Habitica/res/layout/activity_gift_gems.xml    | 120 +++++++++++++
 ...iap.xml => activity_gift_subscription.xml} |   0
 Habitica/res/navigation/navigation.xml        |  26 +++
 Habitica/res/values/strings.xml               |  12 +-
 .../habitica/components/UserComponent.java    |   7 +-
 .../implementation/SocialRepositoryImpl.kt    |  14 +-
 .../habitica/helpers/PurchaseHandler.kt       |   3 +-
 .../ui/activities/FullProfileActivity.kt      |  23 +--
 .../ui/activities/GiftGemsActivity.kt         | 162 ++++++++++++++++++
 ...ctivity.kt => GiftSubscriptionActivity.kt} |  19 +-
 .../ui/fragments/SubscriptionFragment.kt      |   4 +-
 17 files changed, 409 insertions(+), 36 deletions(-)
 create mode 100644 Habitica/res/drawable-xhdpi/icon_gift_gems.png
 create mode 100644 Habitica/res/drawable-xhdpi/icon_gift_subscription.png
 create mode 100644 Habitica/res/drawable-xhdpi/icon_messages.png
 create mode 100644 Habitica/res/layout/activity_gift_gems.xml
 rename Habitica/res/layout/{activity_gift_iap.xml => activity_gift_subscription.xml} (100%)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
 rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/{GiftIAPActivity.kt => GiftSubscriptionActivity.kt} (90%)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index a36793af0..81a52524a 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -99,9 +99,13 @@
             android:label="@string/app_name">
         </activity>
         <activity
-            android:name=".ui.activities.GiftIAPActivity"
+            android:name=".ui.activities.GiftSubscriptionActivity"
             android:label="@string/gift_subscription">
         </activity>
+        <activity
+            android:name=".ui.activities.GiftGemsActivity"
+            android:label="@string/gift_gems">
+        </activity>
         <activity
             android:name=".ui.activities.GuidelinesActivity"
             android:label="@string/community_guidelines">
diff --git a/Habitica/res/drawable-xhdpi/icon_gift_gems.png b/Habitica/res/drawable-xhdpi/icon_gift_gems.png
new file mode 100644
index 0000000000000000000000000000000000000000..40175d0ec4e3ff5db6827bc7baef58e1cc116c19
GIT binary patch
literal 5101
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
DH|O#c

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/icon_gift_subscription.png b/Habitica/res/drawable-xhdpi/icon_gift_subscription.png
new file mode 100644
index 0000000000000000000000000000000000000000..cef67e8c5bb5434a6861437c86c5b52307020322
GIT binary patch
literal 4934
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

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/icon_messages.png b/Habitica/res/drawable-xhdpi/icon_messages.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e377aad8b37739273ff2d6d1db4e73960a180d2
GIT binary patch
literal 3719
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
F{tv1FexLvV

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/layout_rounded_bg_light_gray.xml b/Habitica/res/drawable/layout_rounded_bg_light_gray.xml
index 2bbaf940d..cfa64aed6 100644
--- a/Habitica/res/drawable/layout_rounded_bg_light_gray.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_light_gray.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/task_gray" />
+    <solid android:color="@color/gray_500" />
     <corners android:radius="@dimen/bar_radius"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index efead96d4..899137d69 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -138,13 +138,12 @@
                         </LinearLayout>
                     </LinearLayout>
 
-
                     <TextView
                         android:id="@+id/profile_blurb"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textIsSelectable="true"
-                        android:text="Blurb" />
+                        tools:text="Blurb" />
 
                     <com.facebook.drawee.view.SimpleDraweeView
                         android:id="@+id/profile_image"
@@ -152,7 +151,8 @@
                         android:layout_height="match_parent"
                         android:layout_margin="5dp"
                         android:minHeight="200dp"
-                        fresco:actualImageScaleType="fitCenter" />
+                        fresco:actualImageScaleType="fitCenter"
+                        android:visibility="gone"/>
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -207,6 +207,47 @@
                 </LinearLayout>
             </androidx.cardview.widget.CardView>
 
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="?android:attr/buttonBarStyle">
+                    <Button
+                        android:id="@+id/send_message_button"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:text="@string/profile_send_message"
+                        style="?android:attr/buttonBarButtonStyle"
+                        android:textAllCaps="false"
+                        android:textSize="13sp"
+                        android:drawableTop="@drawable/icon_messages"/>
+                    <Button
+                        android:id="@+id/gift_gems_button"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:text="@string/profile_gift_gems"
+                        style="?android:attr/buttonBarButtonStyle"
+                        android:textAllCaps="false"
+                        android:textSize="13sp"
+                        android:drawableTop="@drawable/icon_gift_gems"/>
+                    <Button
+                        android:id="@+id/gift_subscription_button"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="wrap_content"
+                        android:text="@string/profile_gift_subscription"
+                        style="?android:attr/buttonBarButtonStyle"
+                        android:textAllCaps="false"
+                        android:textSize="13sp"
+                        android:drawableTop="@drawable/icon_gift_subscription"/>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
             <androidx.cardview.widget.CardView
                 style="@style/CardView.Default"
                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml
new file mode 100644
index 000000000..8ed8688fd
--- /dev/null
+++ b/Habitica/res/layout/activity_gift_gems.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
+    android:background="@color/white">
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+    <androidx.core.widget.NestedScrollView
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_marginTop="@dimen/spacing_large">
+            <com.habitrpg.android.habitica.ui.AvatarView
+                android:id="@+id/avatar_view"
+                android:layout_width="88dp"
+                android:layout_height="84dp"
+                app:showBackground="false"
+                app:showPet="false"
+                app:showMount="false"
+                app:showSleeping="false"
+                android:layout_gravity="center_horizontal"/>
+            <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+                android:id="@+id/display_name_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                />
+            <TextView
+                android:id="@+id/username_textview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/gray_300"
+                android:textSize="12sp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="@dimen/spacing_large"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_horizontal"
+                android:text="@string/gift_gems_subtitle"
+                android:textColor="@color/gray_300"
+                android:layout_marginLeft="@dimen/spacing_large"
+                android:layout_marginRight="@dimen/spacing_large"
+                android:layout_marginBottom="@dimen/spacing_large"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginBottom="16dp">
+                    <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
+                        android:id="@+id/gems_4_view"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        app:gemAmount="4"
+                        app:gemDrawable="@drawable/gems_4"
+                        android:layout_marginRight="16dp"
+                        android:layout_marginEnd="16dp"
+                        />
+                    <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
+                        android:id="@+id/gems_21_view"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        app:gemAmount="21"
+                        app:gemDrawable="@drawable/gems_21" />
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:dividerPadding="16dp"
+                    android:showDividers="middle"
+                    android:divider="@android:color/white">
+                    <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
+                        android:id="@+id/gems_42_view"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        app:gemAmount="42"
+                        app:gemDrawable="@drawable/gems_42"
+                        android:layout_marginRight="16dp"
+                        android:layout_marginEnd="16dp" />
+                    <com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
+                        android:id="@+id/gems_84_view"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        app:gemAmount="84"
+                        app:gemDrawable="@drawable/gems_84" />
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
diff --git a/Habitica/res/layout/activity_gift_iap.xml b/Habitica/res/layout/activity_gift_subscription.xml
similarity index 100%
rename from Habitica/res/layout/activity_gift_iap.xml
rename to Habitica/res/layout/activity_gift_subscription.xml
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 15bd80aec..1bbfe1853 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -149,6 +149,32 @@
             app:argType="boolean"
             android:defaultValue="false" />
     </activity>
+    <activity
+        android:id="@+id/giftGemsActivity"
+        android:name="com.habitrpg.android.habitica.ui.activities.GiftGemsActivity"
+        android:label="@string/gift_gems" >
+        <argument
+            android:name="userID"
+            app:argType="string"
+            app:nullable="true" />
+        <argument
+            android:name="username"
+            app:argType="string"
+            app:nullable="true" />
+    </activity>
+    <activity
+        android:id="@+id/giftSubscriptionActivity"
+        android:name="com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity"
+        android:label="@string/gift_subscription" >
+        <argument
+            android:name="userID"
+            app:argType="string"
+            app:nullable="true" />
+        <argument
+            android:name="username"
+            app:argType="string"
+            app:nullable="true" />
+    </activity>
     <fragment
         android:id="@+id/newsFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.NewsFragment"
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index e47ec5502..f18db11ad 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -703,17 +703,19 @@
     <string name="equipment_per">PER:</string>
     <string name="visit_website">visit website</string>
     <string name="subscribe_gift_description">Want to give the benefits of a subscription to someone else?</string>
-    <string name="gift_subscription">Gift a Subscription</string>
+    <string name="gift_subscription">Gift Subscription</string>
     <string name="gift_one_get_one_description">Gift a sub and get a sub free event going on now!</string>
     <string name="gift_title">Who would you like to gift to?</string>
     <string name="gift_one_get_one">Gift one, Get one!</string>
     <string name="gift_one_get_one_detailed_description">While this promotion is active, you’ll receive a matching subscription automatically after sending your gift.</string>
     <string name="gift_subscription_subtitle">Choose the subscription you’d like to gift below! This purchase won’t automatically renew.</string>
+    <string name="gift_gems_subtitle">Choose the gem packet you’d like to gift below!</string>
     <string name="send_gift">Send Gift</string>
     <string name="server">Server</string>
     <string name="gift_confirmation_title">Your gift was sent!</string>
-    <string name="gift_confirmation_text_g1g1">You sent %s a %s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion!</string>
-    <string name="gift_confirmation_text">You sent %s a %s-month Habitica subscription.</string>
+    <string name="gift_confirmation_text_sub_g1g1">You sent %s a %s-month Habitica subscription and the same subscription was applied to your account for our Gift One Get One promotion!</string>
+    <string name="gift_confirmation_text_sub">You sent %s a %s-month Habitica subscription.</string>
+    <string name="gift_confirmation_text_gems">You sent %s %s gems.</string>
     <string name="discover">Discover</string>
     <string name="damage_paused">Damage paused</string>
     <string name="preference_push_important_announcements">Important Announcements</string>
@@ -848,4 +850,8 @@
     <string name="promo_subscription_buy_gems_prompt">Need Gems?</string>
     <string name="promo_subscription_buy_gems_description">Become a Subscriber to buy Gems with gold, get monthly mystery items, increased drop caps and more!</string>
     <string name="see_other_options">See other Options</string>
+    <string name="gift_gems">Gift Gems</string>
+    <string name="profile_send_message">Send\nMessage</string>
+    <string name="profile_gift_gems">Gift\nGems</string>
+    <string name="profile_gift_subscription">Gift\nSubscription</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index ab5e56840..6386caa38 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -18,7 +18,8 @@ import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
 import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity;
 import com.habitrpg.android.habitica.ui.activities.FullProfileActivity;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
-import com.habitrpg.android.habitica.ui.activities.GiftIAPActivity;
+import com.habitrpg.android.habitica.ui.activities.GiftGemsActivity;
+import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity;
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
 import com.habitrpg.android.habitica.ui.activities.GroupInviteActivity;
 import com.habitrpg.android.habitica.ui.activities.HabitButtonWidgetActivity;
@@ -302,7 +303,7 @@ public interface UserComponent {
 
     void inject(@NotNull ChatFragment chatFragment);
 
-    void inject(@NotNull GiftIAPActivity giftIAPActivity);
+    void inject(@NotNull GiftSubscriptionActivity giftSubscriptionActivity);
 
     void inject(@NotNull AboutFragment aboutFragment);
 
@@ -319,4 +320,6 @@ public interface UserComponent {
     void inject(@NotNull InboxViewModel inboxViewModel);
 
     void inject(@NotNull InsufficientGemsDialog insufficientGemsDialog);
+
+    void inject(@NotNull GiftGemsActivity giftGemsActivity);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index 3ee0ea7d1..e3c3cad28 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -16,6 +16,8 @@ import io.reactivex.Single
 import io.reactivex.functions.BiFunction
 import io.reactivex.functions.Consumer
 import io.realm.RealmResults
+import java.util.*
+import kotlin.collections.HashMap
 
 class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: ApiClient, userID: String) : BaseRepositoryImpl<SocialLocalRepository>(localRepository, apiClient, userID), SocialRepository {
     override fun transferGroupOwnership(groupID: String, userID: String): Flowable<Group> {
@@ -247,13 +249,17 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
     override fun getMember(userId: String?): Flowable<Member> {
         return if (userId == null) {
             Flowable.empty()
-        } else apiClient.getMember(userId)
+        } else {
+            try {
+                apiClient.getMember(UUID.fromString(userId).toString())
+            } catch(_: IllegalArgumentException) {
+                apiClient.getMemberWithUsername(userId)
+            }
+        }
     }
 
     override fun getMemberWithUsername(username: String?): Flowable<Member> {
-        return if (username == null) {
-            Flowable.empty()
-        } else apiClient.getMemberWithUsername(username)
+        return getMember(username)
     }
 
     override fun findUsernames(username: String, context: String?, id: String?): Flowable<List<FindUsernameResult>> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
index fec1c9133..ed260fd65 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
@@ -162,9 +162,8 @@ class PurchaseHandler(activity: Activity, val crashlyticsProxy: CrashlyticsProxy
         }
     }
 
-    fun purchaseGiftedSubscription(sku: Sku, giftedUserID: String?) {
+    fun purchaseNoRenewSubscription(sku: Sku) {
         checkout?.let {
-            HabiticaPurchaseVerifier.pendingGifts[sku.id.code] = giftedUserID
             billingRequests?.purchase(ProductTypes.IN_APP, sku.id.code, null, it.createOneShotPurchaseFlow(object : RequestListener<Purchase> {
                 override fun onSuccess(result: Purchase) {
                     billingRequests?.consume(result.token, object : RequestListener<Any> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index 4c5ac8972..2ca8b2775 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -3,11 +3,15 @@ package com.habitrpg.android.habitica.ui.activities
 import android.content.Context
 import android.graphics.Typeface
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.widget.*
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
+import androidx.core.os.bundleOf
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.drawee.controller.BaseControllerListener
 import com.facebook.drawee.view.SimpleDraweeView
@@ -77,6 +81,9 @@ class FullProfileActivity : BaseActivity() {
     private val joinedView: TextView by bindView(R.id.joined_view)
     private val lastLoginView: TextView by bindView(R.id.last_login_view)
     private val totalCheckinsView: TextView by bindView(R.id.total_checkins_view)
+    private val sendMessageButton: Button by bindView(R.id.send_message_button)
+    private val giftGemsButton: Button by bindView(R.id.gift_gems_button)
+    private val giftSubscriptionButton: Button by bindView(R.id.gift_subscription_button)
 
     private var userID = ""
     private var userName: String? = null
@@ -110,6 +117,10 @@ class FullProfileActivity : BaseActivity() {
         attributesCardView.setOnClickListener { toggleAttributeDetails() }
 
         avatarWithBars = AvatarWithBarsViewModel(this, avatarWithStatsView)
+
+        sendMessageButton.setOnClickListener { showSendMessageToUserDialog() }
+        giftGemsButton.setOnClickListener { MainNavigationController.navigate(R.id.giftGemsActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
+        giftSubscriptionButton.setOnClickListener { MainNavigationController.navigate(R.id.giftSubscriptionActivity, bundleOf(Pair("userID", userID), Pair("username", null))) }
     }
 
     override fun onDestroy() {
@@ -119,10 +130,6 @@ class FullProfileActivity : BaseActivity() {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
-            R.id.private_message -> {
-                showSendMessageToUserDialog()
-                true
-            }
             android.R.id.home -> {
                 // app icon in action bar clicked; goto parent activity.
                 this.finish()
@@ -452,12 +459,6 @@ class FullProfileActivity : BaseActivity() {
         component?.inject(this)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.menu_full_profile, menu)
-        return true
-    }
-
     companion object {
 
         fun open(userId: String) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
new file mode 100644
index 000000000..b856e3501
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftGemsActivity.kt
@@ -0,0 +1,162 @@
+package com.habitrpg.android.habitica.ui.activities
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.MenuItem
+import android.view.View
+import android.widget.TextView
+import androidx.appcompat.widget.Toolbar
+import androidx.navigation.navArgs
+import com.habitrpg.android.habitica.HabiticaPurchaseVerifier
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent
+import com.habitrpg.android.habitica.extensions.addOkButton
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.PurchaseHandler
+import com.habitrpg.android.habitica.helpers.PurchaseTypes
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
+import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView
+import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+import io.reactivex.functions.Consumer
+import org.greenrobot.eventbus.Subscribe
+import javax.inject.Inject
+
+class GiftGemsActivity : BaseActivity() {
+
+    @Inject
+    lateinit var crashlyticsProxy: CrashlyticsProxy
+    @Inject
+    lateinit var socialRepository: SocialRepository
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    private var purchaseHandler: PurchaseHandler? = null
+
+    private val toolbar: Toolbar by bindView(R.id.toolbar)
+
+    private val avatarView: AvatarView by bindView(R.id.avatar_view)
+    private val displayNameTextView: UsernameLabel by bindView(R.id.display_name_textview)
+    private val usernameTextView: TextView by bindView(R.id.username_textview)
+
+    private val gems4View: GemPurchaseOptionsView? by bindView(R.id.gems_4_view)
+    private val gems21View: GemPurchaseOptionsView? by bindView(R.id.gems_21_view)
+    private val gems42View: GemPurchaseOptionsView? by bindView(R.id.gems_42_view)
+    private val gems84View: GemPurchaseOptionsView? by bindView(R.id.gems_84_view)
+
+    private var giftedUsername: String? = null
+    private var giftedUserID: String? = null
+
+    override fun getLayoutResId(): Int {
+        return R.layout.activity_gift_gems
+    }
+
+    override fun injectActivity(component: UserComponent?) {
+        component?.inject(this)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setTitle(R.string.gift_gems)
+        setSupportActionBar(toolbar)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setDisplayShowHomeEnabled(true)
+
+        giftedUserID = intent.getStringExtra("userID") ?: navArgs<GiftGemsActivityArgs>().value.userID
+        giftedUsername = intent.getStringExtra("username") ?: navArgs<GiftGemsActivityArgs>().value.username
+
+        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe(Consumer {
+            avatarView.setAvatar(it)
+            displayNameTextView.username = it.profile?.name
+            displayNameTextView.tier = it.contributor?.level ?: 0
+            usernameTextView.text = "@${it.username}"
+            giftedUserID = it.id
+            giftedUsername = it.username
+        }, RxErrorHandler.handleEmptyError()))
+
+        purchaseHandler?.getAllGemSKUs { skus ->
+            for (sku in skus) {
+                updateButtonLabel(sku.id.code, sku.price)
+            }
+        }
+    }
+
+    override fun onStart() {
+        super.onStart()
+        purchaseHandler = PurchaseHandler(this, crashlyticsProxy)
+        purchaseHandler?.startListening()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        gems4View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase4Gems) })
+        gems21View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase21Gems) })
+        gems42View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase42Gems) })
+        gems84View?.setOnPurchaseClickListener(View.OnClickListener { purchaseGems(PurchaseTypes.Purchase84Gems) })
+    }
+
+    override fun onStop() {
+        purchaseHandler?.stopListening()
+        super.onStop()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        purchaseHandler?.onResult(requestCode, resultCode, data)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            finish()
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun updateButtonLabel(sku: String, price: String) {
+        val matchingView: GemPurchaseOptionsView? = when (sku) {
+            PurchaseTypes.Purchase4Gems -> gems4View
+            PurchaseTypes.Purchase21Gems -> gems21View
+            PurchaseTypes.Purchase42Gems -> gems42View
+            PurchaseTypes.Purchase84Gems -> gems84View
+            else -> return
+        }
+        if (matchingView != null) {
+            matchingView.setPurchaseButtonText(price)
+            matchingView.sku = sku
+        }
+    }
+
+    @Subscribe
+    fun onConsumablePurchased(event: ConsumablePurchasedEvent) {
+        purchaseHandler?.consumePurchase(event.purchase)
+        runOnUiThread {
+            displayConfirmationDialog()
+        }
+    }
+
+    private fun displayConfirmationDialog() {
+        val message = getString(R.string.gift_confirmation_text_gems, giftedUsername, "1")
+        val alert = HabiticaAlertDialog(this)
+        alert.setTitle(R.string.gift_confirmation_title)
+        alert.setMessage(message)
+        alert.addOkButton { dialog, _ ->
+            dialog.dismiss()
+            finish()
+        }
+        alert.enqueue()
+    }
+
+
+    fun purchaseGems(identifier: String) {
+        HabiticaPurchaseVerifier.pendingGifts[identifier] = giftedUserID
+        purchaseHandler?.purchaseGems(identifier)
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
similarity index 90%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
index 38576bc15..c9f59d842 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftIAPActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GiftSubscriptionActivity.kt
@@ -9,6 +9,8 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.isVisible
+import androidx.navigation.navArgs
+import com.habitrpg.android.habitica.HabiticaPurchaseVerifier
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.SocialRepository
@@ -32,7 +34,7 @@ import org.solovyev.android.checkout.Sku
 import javax.inject.Inject
 
 
-class GiftIAPActivity: BaseActivity() {
+class GiftSubscriptionActivity : BaseActivity() {
 
     @Inject
     lateinit var crashlyticsProxy: CrashlyticsProxy
@@ -65,7 +67,7 @@ class GiftIAPActivity: BaseActivity() {
     private var skus: List<Sku> = emptyList()
 
     override fun getLayoutResId(): Int {
-        return R.layout.activity_gift_iap
+        return R.layout.activity_gift_subscription
     }
 
     override fun injectActivity(component: UserComponent?) {
@@ -81,7 +83,8 @@ class GiftIAPActivity: BaseActivity() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
 
-        giftedUsername = intent.getStringExtra("username")
+        giftedUserID = intent.getStringExtra("userID") ?: navArgs<GiftSubscriptionActivityArgs>().value.userID
+        giftedUsername = intent.getStringExtra("username") ?: navArgs<GiftSubscriptionActivityArgs>().value.username
 
         subscriptionButton?.setOnClickListener {
             selectedSubscriptionSku?.let { sku -> purchaseSubscription(sku) }
@@ -89,12 +92,13 @@ class GiftIAPActivity: BaseActivity() {
 
         giftOneGetOneContainer?.isVisible = appConfigManager.enableGiftOneGetOne()
 
-        compositeSubscription.add(socialRepository.getMemberWithUsername(giftedUsername).subscribe(Consumer {
+        compositeSubscription.add(socialRepository.getMember(giftedUsername ?: giftedUserID).subscribe(Consumer {
             avatarView.setAvatar(it)
             displayNameTextView.username = it.profile?.name
             displayNameTextView.tier = it.contributor?.level ?: 0
             usernameTextView.text = "@${it.username}"
             giftedUserID = it.id
+            giftedUsername = it.username
         }, RxErrorHandler.handleEmptyError()))
     }
 
@@ -179,7 +183,8 @@ class GiftIAPActivity: BaseActivity() {
         if (giftedUserID?.isNotEmpty() != true) {
             return
         }
-        purchaseHandler?.purchaseGiftedSubscription(sku, giftedUserID)
+        HabiticaPurchaseVerifier.pendingGifts[sku.id.code] = giftedUserID
+        purchaseHandler?.purchaseNoRenewSubscription(sku)
     }
 
 
@@ -203,9 +208,9 @@ class GiftIAPActivity: BaseActivity() {
 
     private fun displayConfirmationDialog() {
         val message = getString(if (appConfigManager.enableGiftOneGetOne()){
-            R.string.gift_confirmation_text_g1g1
+            R.string.gift_confirmation_text_sub_g1g1
         } else {
-            R.string.gift_confirmation_text
+            R.string.gift_confirmation_text_sub
         }, giftedUsername, selectedDurationString())
         val alert = HabiticaAlertDialog(this)
         alert.setTitle(R.string.gift_confirmation_title)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt
index 02e4a70fc..b8cc975f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.kt
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.proxy.CrashlyticsProxy
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity
-import com.habitrpg.android.habitica.ui.activities.GiftIAPActivity
+import com.habitrpg.android.habitica.ui.activities.GiftSubscriptionActivity
 import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.helpers.dismissKeyboard
@@ -247,7 +247,7 @@ class SubscriptionFragment : BaseFragment(), GemPurchaseActivity.CheckoutFragmen
             alert.setTitle(getString(R.string.gift_title))
             alert.addButton(getString(R.string.action_continue), true) { _, _ ->
                         val usernameEditText = chooseRecipientDialogView?.findViewById<View>(R.id.uuidEditText) as? EditText
-                        val intent = Intent(thisActivity, GiftIAPActivity::class.java).apply {
+                        val intent = Intent(thisActivity, GiftSubscriptionActivity::class.java).apply {
                             putExtra("username", usernameEditText?.text.toString())
                         }
                         startActivity(intent)