diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index f6c45879c..aa7037eb5 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -97,6 +97,10 @@
android:name=".ui.activities.GiftIAPActivity"
android:label="@string/gift_subscription">
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index b5278972c..871c95d1a 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -249,6 +249,9 @@
android:name="userID"
app:argType="string" />
+
(R.id.webview).post {
+ findViewById(R.id.webview).loadData(AndDown().markdownToHtml(text), "text/html; charset=utf-8", "utf-8")
+ }
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
index 9dcc5f51c..46115a44f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatFragment.kt
@@ -3,14 +3,12 @@ package com.habitrpg.android.habitica.ui.fragments.social
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
-import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
-import androidx.core.net.toUri
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -106,9 +104,7 @@ class ChatFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
viewModel?.getChatMessages()?.subscribe(Consumer> { this.setChatMessages(it) }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
communityGuidelinesReviewView.setOnClickListener {
- val i = Intent(Intent.ACTION_VIEW)
- i.data = "https://habitica.com/static/community-guidelines".toUri()
- context?.startActivity(i)
+ MainNavigationController.navigate(R.id.guidelinesActivity)
}
communityGuidelinesAcceptButton.setOnClickListener {
viewModel?.updateUser("flags.communityGuidelinesAccepted", true)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
index 3285cfb65..1851599ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt
@@ -3,14 +3,12 @@ package com.habitrpg.android.habitica.ui.fragments.social
import android.content.ClipData
import android.content.ClipboardManager
import android.content.Context
-import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
-import androidx.core.net.toUri
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.habitrpg.android.habitica.MainNavDirections
@@ -147,9 +145,7 @@ class ChatListFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {
}
communityGuidelinesReviewView.setOnClickListener {
- val i = Intent(Intent.ACTION_VIEW)
- i.data = "https://habitica.com/static/community-guidelines".toUri()
- context?.startActivity(i)
+ MainNavigationController.navigate(R.id.guidelinesActivity)
}
communityGuidelinesAcceptButton.setOnClickListener {
userRepository.updateUser(user, "flags.communityGuidelinesAccepted", true).subscribe(Consumer {}, RxErrorHandler.handleEmptyError())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
index 9d4b8307e..9f6f9e662 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
@@ -1,7 +1,6 @@
package com.habitrpg.android.habitica.ui.fragments.social
import android.content.Context
-import android.content.Intent
import android.graphics.PorterDuff
import android.os.Bundle
import android.view.Gravity
@@ -12,7 +11,6 @@ import android.widget.FrameLayout
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.data.InventoryRepository
@@ -117,9 +115,7 @@ class TavernDetailFragment : BaseFragment() {
user?.notNull { user -> userRepository.sleep(user).subscribe(Consumer { }, RxErrorHandler.handleEmptyError()) }
}
guidelinesButton.setOnClickListener {
- val i = Intent(Intent.ACTION_VIEW)
- i.data = "https://habitica.com/static/community-guidelines".toUri()
- context?.startActivity(i)
+ MainNavigationController.navigate(R.id.guidelinesActivity)
}
faqButton.setOnClickListener {
MainNavigationController.navigate(R.id.FAQOverviewFragment)