From ff13231a1b37ad2d5ee096b283feb779b45a292a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 18 Mar 2020 15:33:40 +0100
Subject: [PATCH] change about screen

---
 Habitica/res/layout/fragment_about.xml        | 12 ------
 Habitica/res/navigation/navigation.xml        |  6 +--
 Habitica/res/values/strings.xml               |  2 +
 .../habitica/ui/fragments/AboutFragment.kt    | 43 +------------------
 4 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index f7d922441..787574e97 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -115,18 +115,6 @@
             android:textColor="@color/white"
             android:textSize="@dimen/card_medium_text" />
 
-        <Button
-            android:id="@+id/sendFeedback"
-            android:layout_width="250dp"
-            android:layout_height="35dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20sp"
-            android:background="@drawable/rounded_purple_square"
-            android:text="@string/about_give_us_feedback"
-            android:textAllCaps="false"
-            android:textColor="@color/white"
-            android:textSize="@dimen/card_medium_text" />
-
         <TextView
             android:id="@+id/sourceCodeLink"
             android:layout_width="match_parent"
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index 09414ef2d..4c102edb9 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -203,7 +203,7 @@
     <fragment
         android:id="@+id/FAQOverviewFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment"
-        android:label="@string/sidebar_help" >
+        android:label="@string/habitica_questions">
         <deepLink app:uri="habitica.com/static/faq" />
     </fragment>
     <fragment
@@ -395,7 +395,7 @@
     <fragment
         android:id="@+id/supportMainFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment"
-        android:label="SupportMainFragment" >
+        android:label="@string/support" >
         <action
             android:id="@+id/showFAQFragment"
             app:destination="@id/FAQOverviewFragment" />
@@ -403,5 +403,5 @@
     <fragment
         android:id="@+id/bugFixFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.support.BugFixFragment"
-        android:label="BugFixFragment" />
+        android:label="@string/bugs_fixes" />
 </navigation>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 61d8df76b..1e0792821 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -995,5 +995,7 @@
     <string name="manual_sync_restart_description">Sometimes the app won’t automatically update content. Try pulling to refresh or force closing the app and reopening it.</string>
     <string name="update_app">Update the App</string>
     <string name="update_app_description">We’re constantly pushing out new fixes, so be sure to check the Play Store to see if there are any updates available.</string>
+    <string name="support">Support</string>
     <string name="wacky"> Wacky </string>
+    <string name="habitica_questions">Habitica Questions</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
index 339e4cff8..c34f920ab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments
 
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -11,14 +10,13 @@ import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
 import android.widget.TextView
 import android.widget.Toast
-import androidx.core.app.ShareCompat
 import androidx.core.net.toUri
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
 import com.habitrpg.android.habitica.helpers.AppConfigManager
-import com.habitrpg.android.habitica.helpers.AppTestingLevel
 import com.habitrpg.android.habitica.helpers.DeviceName
+import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
 import com.habitrpg.android.habitica.ui.helpers.bindView
@@ -122,8 +120,7 @@ class AboutFragment : BaseMainFragment() {
         sourceCodeLink.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
         twitter.setOnClickListener { openBrowserLink(twitterLink) }
         sourceCodeButton.setOnClickListener { openBrowserLink(androidSourceCodeLink) }
-        reportBug.setOnClickListener { sendEmail("[Android] Bugreport") }
-        sendFeedback.setOnClickListener { sendEmail("[Android] Feedback") }
+        reportBug.setOnClickListener { MainNavigationController.navigate(R.id.bugFixFragment) }
         googlePlayStoreButton.setOnClickListener { openGooglePlay() }
         updateAvailableWrapper.setOnClickListener { openGooglePlay() }
     }
@@ -134,42 +131,6 @@ class AboutFragment : BaseMainFragment() {
         startActivity(launchBrowser)
     }
 
-    private fun sendEmail(subject: String) {
-        val version = Build.VERSION.SDK_INT
-        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
-        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
-        var bodyOfEmail = "Device: $manufacturer $deviceName" +
-                " \nAndroid Version: $version"+
-                " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode)
-
-        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
-            bodyOfEmail += " ${appConfigManager.testingLevel().name}"
-        }
-        bodyOfEmail += " \nUser ID: $userId"
-
-        val user = this.user
-        if (user != null) {
-            bodyOfEmail += " \nLevel: " + (user.stats?.lvl ?: 0) +
-                    " \nClass: " + (if (user.preferences?.disableClasses == true) "Disabled" else (user.stats?.habitClass ?: "None")) +
-                    " \nIs in Inn: " + (user.preferences?.sleep ?: false) +
-                    " \nUses Costume: " + (user.preferences?.costume ?: false) +
-                    " \nCustom Day Start: " + (user.preferences?.dayStart ?: 0) +
-                    " \nTimezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
-        }
-
-        bodyOfEmail += " \nDetails:\n"
-
-        activity?.let {
-            ShareCompat.IntentBuilder.from(it)
-                .setType("message/rfc822")
-                .addEmailTo(appConfigManager.supportEmail())
-                .setSubject(subject)
-                .setText(bodyOfEmail)
-                .setChooserTitle("Send email...")
-                .startChooser()
-        }
-    }
-
     private fun doTheThing() {
         context?.let { FirebaseAnalytics.getInstance(it).logEvent("found_easter_egg", null) }
         DataBindingUtils.loadImage("Pet-Sabretooth-Base") {bitmap ->