POC Unified Chrome Management #3311
+733
−235
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,14 +14,11 @@ import android.view.ViewGroup | |
| import androidx.activity.result.ActivityResultLauncher | ||
| import androidx.activity.result.contract.ActivityResultContracts | ||
| import androidx.annotation.CallSuper | ||
| import androidx.coordinatorlayout.widget.CoordinatorLayout | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.preference.PreferenceManager | ||
| import androidx.swiperefreshlayout.widget.SwipeRefreshLayout | ||
| import mozilla.components.browser.state.selector.selectedTab | ||
| import mozilla.components.concept.engine.EngineView | ||
| import mozilla.components.feature.app.links.AppLinksFeature | ||
| import mozilla.components.feature.downloads.DownloadsFeature | ||
|
|
@@ -45,7 +42,6 @@ import mozilla.components.support.base.log.logger.Logger | |
| import mozilla.components.support.ktx.android.view.enterImmersiveMode | ||
| import mozilla.components.support.ktx.android.view.exitImmersiveMode | ||
| import mozilla.components.ui.widgets.behavior.EngineViewClippingBehavior | ||
| import org.mozilla.reference.browser.BuildConfig | ||
| import org.mozilla.reference.browser.R | ||
| import org.mozilla.reference.browser.addons.WebExtensionPromptFeature | ||
|
|
@@ -55,7 +51,6 @@ import org.mozilla.reference.browser.ext.requireComponents | |
| import org.mozilla.reference.browser.pip.PictureInPictureIntegration | ||
| import org.mozilla.reference.browser.tabs.LastTabFeature | ||
| import mozilla.components.ui.widgets.behavior.ToolbarPosition as MozacEngineBehaviorToolbarPosition | ||
|
|
||
| /** | ||
| * Base fragment extended by [BrowserFragment] and [ExternalAppBrowserFragment]. | ||
|
|
@@ -64,7 +59,6 @@ import mozilla.components.ui.widgets.behavior.ViewPosition as MozacToolbarBehavi | |
| */ | ||
| abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, ActivityResultHandler { | ||
| private val sessionFeature = ViewBoundFeatureWrapper<SessionFeature>() | ||
| private val contextMenuIntegration = ViewBoundFeatureWrapper<ContextMenuIntegration>() | ||
| private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>() | ||
| private val shareDownloadsFeature = ViewBoundFeatureWrapper<ShareDownloadFeature>() | ||
|
|
@@ -84,18 +78,15 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
|
|
||
| private val engineView: EngineView | ||
| get() = requireView().findViewById<View>(R.id.engineView) as EngineView | ||
| protected val findInPageBar: FindInPageBar | ||
| get() = requireView().findViewById(R.id.findInPageBar) | ||
| private val swipeRefresh: SwipeRefreshLayout | ||
| get() = requireView().findViewById(R.id.swipeRefresh) | ||
|
|
||
| private val backButtonHandler: List<ViewBoundFeatureWrapper<*>> = listOf( | ||
| fullScreenFeature, | ||
| findInPageIntegration, | ||
| // toolbarIntegration, | ||
| sessionFeature, | ||
| lastTabFeature, | ||
| ) | ||
|
|
@@ -114,6 +105,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
| private lateinit var requestSitePermissionsLauncher: ActivityResultLauncher<Array<String>> | ||
| private lateinit var requestPromptsPermissionsLauncher: ActivityResultLauncher<Array<String>> | ||
|
|
||
| private val logger = Logger("BaseBrowserFragment") | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| requestDownloadPermissionsLauncher = | ||
|
|
@@ -153,16 +146,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
| } | ||
| } | ||
|
|
||
| @CallSuper | ||
| @Suppress("LongMethod") | ||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
|
|
@@ -180,28 +163,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
| view = view, | ||
| ) | ||
|
|
||
| contextMenuIntegration.set( | ||
| feature = ContextMenuIntegration( | ||
| requireContext(), | ||
|
|
@@ -357,7 +318,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
| context, | ||
| null, | ||
| swipeRefresh, | ||
| resources.getDimensionPixelSize(R.dimen.browser_toolbar_height), | ||
| MozacEngineBehaviorToolbarPosition.BOTTOM, | ||
| ) | ||
| } | ||
|
|
@@ -402,28 +363,21 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
| view = view, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private fun fullScreenChanged(enabled: Boolean) { | ||
| if (enabled) { | ||
| activity?.enterImmersiveMode() | ||
| engineView.setDynamicToolbarMaxHeight(0) | ||
| } else { | ||
| activity?.exitImmersiveMode() | ||
| engineView.setDynamicToolbarMaxHeight(resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)) | ||
| } | ||
| parentFragment?.parentFragmentManager | ||
|
There was a problem hiding this comment. Communicating between fragments or with the parent should normally be done through a parent ViewModel or in our case a Store. Curious why going with the fragment result instead. |
||
| ?.setFragmentResult( | ||
| BROWSER_TO_MAIN_FRAGMENT_RESULT_KEY, | ||
| Bundle().apply { putBoolean(FULL_SCREEN_MODE_CHANGED, enabled) } | ||
| ) | ||
| } | ||
|
|
||
| private fun viewportFitChanged(viewportFit: Int) { | ||
|
|
@@ -434,7 +388,10 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
|
|
||
| @CallSuper | ||
| override fun onBackPressed(): Boolean { | ||
| logger.info("onBackPressed") | ||
| return backButtonHandler.any { it.onBackPressed() }.also { | ||
| logger.info("Was it handled by back button handlers? $it") | ||
| } | ||
| } | ||
|
|
||
| final override fun onHomePressed(): Boolean { | ||
|
|
@@ -452,16 +409,14 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit | |
| } | ||
|
|
||
| companion object { | ||
| @JvmStatic | ||
| protected fun Bundle.putSessionId(sessionId: String?) { | ||
| putString(SESSION_ID, sessionId) | ||
| } | ||
| } | ||
|
|
||
| override fun onActivityResult(requestCode: Int, data: Intent?, resultCode: Int): Boolean { | ||
| logger.info( | ||
| "Fragment onActivityResult received with " + | ||
| "requestCode: $requestCode, resultCode: $resultCode, data: $data", | ||
| ) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Having
BrowserActivitycallcreateBrowserFragmentwhich would createMainContainerFragmentseems forced.RB uses one activity per feature so if the feature now is "Main.."
Maybe this should be renames to
MainActivity&createMainFragment.Speaking of which, why do we need a fragment parent for home & browser and not just use this Activity?