From e79bf4e3f5645bcab3b18d9eada19216d00011e8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 15 Apr 2020 15:05:35 +0200
Subject: [PATCH] support changes

---
 Habitica/res/layout/fragment_support_main.xml |  6 +++++-
 Habitica/res/values/styles.xml                |  2 +-
 .../ui/fragments/support/BugFixFragment.kt    | 19 +++++++++++--------
 .../fragments/support/SupportMainFragment.kt  | 19 +++++++++++--------
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
index cd72658f2..2ccd6820d 100644
--- a/Habitica/res/layout/fragment_support_main.xml
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -56,6 +56,7 @@
                 android:layout_marginBottom="@dimen/spacing_medium"
                 android:background="@drawable/support_info_lower_bg"
                 android:textColor="@color/white"
+                android:elevation="2dp"
                 android:textAllCaps="false"
                 style="@style/Subheader1"
                 />
@@ -78,6 +79,7 @@
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large"
                 style="@style/Subheader2"
+                android:letterSpacing="0.015"
                 android:textColor="@color/black"
                 />
             <TextView
@@ -104,6 +106,7 @@
                 android:layout_marginBottom="@dimen/spacing_medium"
                 android:background="@drawable/support_info_lower_bg"
                 android:textColor="@color/white"
+                android:elevation="2dp"
                 android:textAllCaps="false"
                 style="@style/Subheader1"
                 />
@@ -126,6 +129,7 @@
                 android:layout_marginStart="@dimen/spacing_large"
                 android:layout_marginEnd="@dimen/spacing_large"
                 style="@style/Subheader2"
+                android:letterSpacing="0.015"
                 android:textColor="@color/black"
                 />
             <TextView
@@ -151,8 +155,8 @@
                 android:layout_marginEnd="@dimen/spacing_medium"
                 android:layout_marginBottom="@dimen/spacing_medium"
                 android:background="@drawable/support_info_lower_bg"
+                android:elevation="2dp"
                 android:textColor="@color/white"
-                android:textStyle="bold"
                 style="@style/Subheader1"
                 />
         </LinearLayout>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index f74c99239..344639979 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -299,7 +299,7 @@
         <item name="android:textColor">@color/gray_200</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:layout_marginStart">@dimen/spacing_large</item>
-        <item name="android:letterSpacing">0.08</item>
+        <item name="android:letterSpacing">0.1</item>
     </style>
 
     <style name="BottomMenu">
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
index 38b437def..bdf01e4ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.ui.fragments.support
 
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.app.ShareCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
@@ -97,13 +97,16 @@ class BugFixFragment: BaseMainFragment() {
         bodyOfEmail += " \nDetails:\n"
 
         activity?.let {
-            ShareCompat.IntentBuilder.from(it)
-                    .setType("message/rfc822")
-                    .addEmailTo(appConfigManager.supportEmail())
-                    .setSubject(subject)
-                    .setText(bodyOfEmail)
-                    .setChooserTitle("Send email...")
-                    .startChooser()
+            val email = Intent(Intent.ACTION_SEND)
+            email.putExtra(Intent.EXTRA_EMAIL, arrayOf<String>(appConfigManager.supportEmail()))
+            email.putExtra(Intent.EXTRA_SUBJECT, subject)
+            email.putExtra(Intent.EXTRA_TEXT, bodyOfEmail)
+
+            //need this to prompts email client only
+            //need this to prompts email client only
+            email.type = "message/rfc822"
+
+            startActivity(Intent.createChooser(email, "Choose an Email client :"))
         }
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
index 28be1802e..bc35a9e48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
@@ -1,12 +1,13 @@
 package com.habitrpg.android.habitica.ui.fragments.support
 
+import android.content.Intent
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.app.ShareCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.data.FAQRepository
@@ -21,6 +22,7 @@ import io.reactivex.Completable
 import javax.inject.Inject
 import javax.inject.Named
 
+
 class SupportMainFragment : BaseMainFragment() {
     private var deviceInfo: DeviceName.DeviceInfo? = null
 
@@ -114,13 +116,14 @@ class SupportMainFragment : BaseMainFragment() {
         bodyOfEmail += " \nDetails:\n"
 
         activity?.let {
-            ShareCompat.IntentBuilder.from(it)
-                    .setType("message/rfc822")
-                    .addEmailTo(appConfigManager.supportEmail())
-                    .setSubject(subject)
-                    .setText(bodyOfEmail)
-                    .setChooserTitle("Send email...")
-                    .startChooser()
+            val emailIntent = Intent(Intent.ACTION_SENDTO)
+            val mailto = "mailto:bob@example.org" +
+                    "?cc=" + "alice@example.com" +
+                    "&subject=" + Uri.encode(subject) +
+                    "&body=" + Uri.encode(bodyOfEmail)
+            emailIntent.setData(Uri.parse(mailto));
+
+            startActivity(Intent.createChooser(emailIntent, "Choose an Email client :"))
         }
     }
 }
\ No newline at end of file