Closes #1894 - Fixes Help Page Navigation
parent
a4e4b8a1c9
commit
534d88f629
|
@ -234,13 +234,22 @@ class HomeFragment : Fragment(), CoroutineScope {
|
||||||
|
|
||||||
private fun setupHomeMenu() {
|
private fun setupHomeMenu() {
|
||||||
homeMenu = HomeMenu(requireContext()) {
|
homeMenu = HomeMenu(requireContext()) {
|
||||||
val directions = when (it) {
|
when (it) {
|
||||||
HomeMenu.Item.Settings -> HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
|
HomeMenu.Item.Settings -> Navigation.findNavController(homeLayout).navigate(
|
||||||
HomeMenu.Item.Library -> HomeFragmentDirections.actionHomeFragmentToLibraryFragment()
|
HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
|
||||||
HomeMenu.Item.Help -> return@HomeMenu // Not implemented yetN
|
)
|
||||||
|
HomeMenu.Item.Library -> Navigation.findNavController(homeLayout).navigate(
|
||||||
|
HomeFragmentDirections.actionHomeFragmentToLibraryFragment()
|
||||||
|
)
|
||||||
|
HomeMenu.Item.Help -> {
|
||||||
|
(activity as HomeActivity).openToBrowserAndLoad(
|
||||||
|
SupportUtils.getSumoURLForTopic(
|
||||||
|
context!!,
|
||||||
|
SupportUtils.SumoTopic.HELP
|
||||||
|
), from = BrowserDirection.FromHome
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Navigation.findNavController(homeLayout).navigate(directions)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -128,16 +128,21 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
|
||||||
navigateToDataChoices()
|
navigateToDataChoices()
|
||||||
}
|
}
|
||||||
resources.getString(pref_key_help) -> {
|
resources.getString(pref_key_help) -> {
|
||||||
requireComponents.useCases.tabsUseCases.addTab
|
(activity as HomeActivity).openToBrowserAndLoad(
|
||||||
.invoke(SupportUtils.getSumoURLForTopic(context!!, SupportUtils.SumoTopic.HELP))
|
SupportUtils.getSumoURLForTopic(
|
||||||
navigateToSettingsArticle()
|
context!!,
|
||||||
|
SupportUtils.SumoTopic.HELP
|
||||||
|
), from = BrowserDirection.FromSettings
|
||||||
|
)
|
||||||
}
|
}
|
||||||
resources.getString(pref_key_rate) -> {
|
resources.getString(pref_key_rate) -> {
|
||||||
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(SupportUtils.RATE_APP_URL)))
|
startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(SupportUtils.RATE_APP_URL)))
|
||||||
}
|
}
|
||||||
resources.getString(pref_key_feedback) -> {
|
resources.getString(pref_key_feedback) -> {
|
||||||
requireComponents.useCases.tabsUseCases.addTab.invoke(SupportUtils.FEEDBACK_URL)
|
(activity as HomeActivity).openToBrowserAndLoad(
|
||||||
navigateToSettingsArticle()
|
SupportUtils.FEEDBACK_URL,
|
||||||
|
from = BrowserDirection.FromSettings
|
||||||
|
)
|
||||||
}
|
}
|
||||||
resources.getString(pref_key_about) -> {
|
resources.getString(pref_key_about) -> {
|
||||||
navigateToAbout()
|
navigateToAbout()
|
||||||
|
@ -259,13 +264,6 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
|
||||||
Navigation.findNavController(view!!).navigate(directions)
|
Navigation.findNavController(view!!).navigate(directions)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun navigateToSettingsArticle() {
|
|
||||||
val newSession = requireComponents.core.sessionManager.selectedSession?.id
|
|
||||||
view?.let {
|
|
||||||
(activity as HomeActivity).openToBrowser(newSession, BrowserDirection.FromSettings)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun navigateToAbout() {
|
private fun navigateToAbout() {
|
||||||
val directions = SettingsFragmentDirections.actionSettingsFragmentToAboutFragment()
|
val directions = SettingsFragmentDirections.actionSettingsFragmentToAboutFragment()
|
||||||
Navigation.findNavController(view!!).navigate(directions)
|
Navigation.findNavController(view!!).navigate(directions)
|
||||||
|
|
Loading…
Reference in New Issue