Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
fenix
Commits
4e499e7a
Commit
4e499e7a
authored
May 20, 2020
by
Jeff Boek
Browse files
For #10504 - Adds tabTrayDialogInteractor to browserfragment
parent
cc6a380d
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
View file @
4e499e7a
...
...
@@ -64,6 +64,7 @@ import mozilla.components.support.base.feature.UserInteractionHandler
import
mozilla.components.support.base.feature.ViewBoundFeatureWrapper
import
mozilla.components.support.ktx.android.view.exitImmersiveModeIfNeeded
import
mozilla.components.support.ktx.android.view.hideKeyboard
import
org.mozilla.fenix.BrowserDirection
import
org.mozilla.fenix.FeatureFlags
import
org.mozilla.fenix.HomeActivity
import
org.mozilla.fenix.IntentReceiverActivity
...
...
@@ -213,6 +214,16 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
onTabCounterClicked
=
{
val
tabTrayDialog
=
TabTrayDialogFragment
()
tabTrayDialog
.
show
(
parentFragmentManager
,
null
)
tabTrayDialog
.
interactor
=
object
:
TabTrayDialogFragment
.
Interactor
{
override
fun
onTabSelected
(
tab
:
mozilla
.
components
.
concept
.
tabstray
.
Tab
)
{
tabTrayDialog
.
dismiss
()
}
override
fun
onNewTabTapped
()
{
tabTrayDialog
.
dismiss
()
findNavController
().
navigate
(
BrowserFragmentDirections
.
actionGlobalHome
())
}
}
}
)
...
...
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View file @
4e499e7a
...
...
@@ -360,6 +360,16 @@ class HomeFragment : Fragment() {
hideOnboardingIfNeeded
()
val
tabTrayDialog
=
TabTrayDialogFragment
()
tabTrayDialog
.
show
(
parentFragmentManager
,
null
)
tabTrayDialog
.
interactor
=
object
:
TabTrayDialogFragment
.
Interactor
{
override
fun
onTabSelected
(
tab
:
mozilla
.
components
.
concept
.
tabstray
.
Tab
)
{
tabTrayDialog
.
dismiss
()
(
activity
as
HomeActivity
).
openToBrowser
(
BrowserDirection
.
FromHome
)
}
override
fun
onNewTabTapped
()
{
tabTrayDialog
.
dismiss
()
}
}
}
PrivateBrowsingButtonView
(
...
...
app/src/main/java/org/mozilla/fenix/tabtray/TabTrayDialogFragment.kt
View file @
4e499e7a
...
...
@@ -17,7 +17,13 @@ import mozilla.components.concept.tabstray.Tab
import
org.mozilla.fenix.R
class
TabTrayDialogFragment
:
AppCompatDialogFragment
(),
TabTrayInteractor
{
interface
Interactor
{
fun
onTabSelected
(
tab
:
Tab
)
fun
onNewTabTapped
()
}
private
lateinit
var
tabTrayView
:
TabTrayView
var
interactor
:
Interactor
?
=
null
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
...
...
@@ -52,11 +58,11 @@ class TabTrayDialogFragment : AppCompatDialogFragment(), TabTrayInteractor {
}
override
fun
onTabSelected
(
tab
:
Tab
)
{
TODO
(
"not implemented"
)
//To change body of created functions use File | Settings | File Templates.
interactor
?.
onTabSelected
(
tab
)
}
override
fun
onNewTabTapped
(
private
:
Boolean
)
{
TODO
(
"not implemented"
)
//To change body of created functions use File | Settings | File Templates.
interactor
?.
onNewTabTapped
()
}
override
fun
onTabTrayDismissed
()
{
...
...
app/src/main/java/org/mozilla/fenix/tabtray/TabTrayFragment.kt
View file @
4e499e7a
...
...
@@ -109,7 +109,6 @@ class TabTrayFragment : Fragment(R.layout.fragment_tab_tray), TabsTray.Observer,
override
fun
onResume
()
{
super
.
onResume
()
onTabsChanged
()
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment