support changes

This commit is contained in:
Phillip Thelen 2020-04-15 15:05:35 +02:00
parent 95fa85c7bb
commit e79bf4e3f5
4 changed files with 28 additions and 18 deletions

View file

@ -56,6 +56,7 @@
android:layout_marginBottom="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium"
android:background="@drawable/support_info_lower_bg" android:background="@drawable/support_info_lower_bg"
android:textColor="@color/white" android:textColor="@color/white"
android:elevation="2dp"
android:textAllCaps="false" android:textAllCaps="false"
style="@style/Subheader1" style="@style/Subheader1"
/> />
@ -78,6 +79,7 @@
android:layout_marginStart="@dimen/spacing_large" android:layout_marginStart="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large" android:layout_marginEnd="@dimen/spacing_large"
style="@style/Subheader2" style="@style/Subheader2"
android:letterSpacing="0.015"
android:textColor="@color/black" android:textColor="@color/black"
/> />
<TextView <TextView
@ -104,6 +106,7 @@
android:layout_marginBottom="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium"
android:background="@drawable/support_info_lower_bg" android:background="@drawable/support_info_lower_bg"
android:textColor="@color/white" android:textColor="@color/white"
android:elevation="2dp"
android:textAllCaps="false" android:textAllCaps="false"
style="@style/Subheader1" style="@style/Subheader1"
/> />
@ -126,6 +129,7 @@
android:layout_marginStart="@dimen/spacing_large" android:layout_marginStart="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large" android:layout_marginEnd="@dimen/spacing_large"
style="@style/Subheader2" style="@style/Subheader2"
android:letterSpacing="0.015"
android:textColor="@color/black" android:textColor="@color/black"
/> />
<TextView <TextView
@ -151,8 +155,8 @@
android:layout_marginEnd="@dimen/spacing_medium" android:layout_marginEnd="@dimen/spacing_medium"
android:layout_marginBottom="@dimen/spacing_medium" android:layout_marginBottom="@dimen/spacing_medium"
android:background="@drawable/support_info_lower_bg" android:background="@drawable/support_info_lower_bg"
android:elevation="2dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textStyle="bold"
style="@style/Subheader1" style="@style/Subheader1"
/> />
</LinearLayout> </LinearLayout>

View file

@ -299,7 +299,7 @@
<item name="android:textColor">@color/gray_200</item> <item name="android:textColor">@color/gray_200</item>
<item name="android:textAllCaps">true</item> <item name="android:textAllCaps">true</item>
<item name="android:layout_marginStart">@dimen/spacing_large</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>
<style name="BottomMenu"> <style name="BottomMenu">

View file

@ -1,12 +1,12 @@
package com.habitrpg.android.habitica.ui.fragments.support package com.habitrpg.android.habitica.ui.fragments.support
import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.app.ShareCompat
import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
@ -97,13 +97,16 @@ class BugFixFragment: BaseMainFragment() {
bodyOfEmail += " \nDetails:\n" bodyOfEmail += " \nDetails:\n"
activity?.let { activity?.let {
ShareCompat.IntentBuilder.from(it) val email = Intent(Intent.ACTION_SEND)
.setType("message/rfc822") email.putExtra(Intent.EXTRA_EMAIL, arrayOf<String>(appConfigManager.supportEmail()))
.addEmailTo(appConfigManager.supportEmail()) email.putExtra(Intent.EXTRA_SUBJECT, subject)
.setSubject(subject) email.putExtra(Intent.EXTRA_TEXT, bodyOfEmail)
.setText(bodyOfEmail)
.setChooserTitle("Send email...") //need this to prompts email client only
.startChooser() //need this to prompts email client only
email.type = "message/rfc822"
startActivity(Intent.createChooser(email, "Choose an Email client :"))
} }
} }
} }

View file

@ -1,12 +1,13 @@
package com.habitrpg.android.habitica.ui.fragments.support package com.habitrpg.android.habitica.ui.fragments.support
import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.app.ShareCompat
import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.UserComponent import com.habitrpg.android.habitica.components.UserComponent
import com.habitrpg.android.habitica.data.FAQRepository import com.habitrpg.android.habitica.data.FAQRepository
@ -21,6 +22,7 @@ import io.reactivex.Completable
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Named import javax.inject.Named
class SupportMainFragment : BaseMainFragment() { class SupportMainFragment : BaseMainFragment() {
private var deviceInfo: DeviceName.DeviceInfo? = null private var deviceInfo: DeviceName.DeviceInfo? = null
@ -114,13 +116,14 @@ class SupportMainFragment : BaseMainFragment() {
bodyOfEmail += " \nDetails:\n" bodyOfEmail += " \nDetails:\n"
activity?.let { activity?.let {
ShareCompat.IntentBuilder.from(it) val emailIntent = Intent(Intent.ACTION_SENDTO)
.setType("message/rfc822") val mailto = "mailto:bob@example.org" +
.addEmailTo(appConfigManager.supportEmail()) "?cc=" + "alice@example.com" +
.setSubject(subject) "&subject=" + Uri.encode(subject) +
.setText(bodyOfEmail) "&body=" + Uri.encode(bodyOfEmail)
.setChooserTitle("Send email...") emailIntent.setData(Uri.parse(mailto));
.startChooser()
startActivity(Intent.createChooser(emailIntent, "Choose an Email client :"))
} }
} }
} }