Skip to content

Commit

Permalink
POC Unified Chrome Management
Browse files Browse the repository at this point in the history
  • Loading branch information
@rahulsainani
rahulsainani committed Dec 23, 2024
1 parent 6b35669 commit bf331b7
Show file tree
Hide file tree
Showing 16 changed files with 645 additions and 228 deletions.
3 changes: 3 additions & 0 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
alias libs.plugins.compose.compiler
alias libs.plugins.dependency.analysis
alias libs.plugins.kotlin.android
alias libs.plugins.androidx.navigation.safeargs
}

apply from: "$project.rootDir/automation/gradle/versionCode.gradle"
Expand Down Expand Up @@ -251,6 +252,8 @@ dependencies {
implementation libs.androidx.recyclerview
implementation libs.androidx.swiperefreshlayout
implementation libs.androidx.work.runtime.ktx
implementation libs.androidx.navigation.fragment
implementation libs.androidx.navigation.ui

implementation platform(libs.androidx.compose.bom)
implementation libs.androidx.compose.foundation
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import mozilla.components.support.webextensions.WebExtensionPopupObserver
import org.mozilla.reference.browser.addons.WebExtensionActionPopupActivity
import org.mozilla.reference.browser.browser.BrowserFragment
import org.mozilla.reference.browser.browser.CrashIntegration
import org.mozilla.reference.browser.browser.MainContainerFragment
import org.mozilla.reference.browser.ext.components
import org.mozilla.reference.browser.ext.isCrashReportActive

Expand All @@ -33,6 +34,8 @@ import org.mozilla.reference.browser.ext.isCrashReportActive
*/
open class BrowserActivity : AppCompatActivity() {

private val logger = Logger("BrowserActivity")

private lateinit var crashIntegration: CrashIntegration

private val sessionId: String?
Expand All @@ -46,7 +49,7 @@ open class BrowserActivity : AppCompatActivity() {
* Returns a new instance of [BrowserFragment] to display.
*/
open fun createBrowserFragment(sessionId: String?): Fragment =
BrowserFragment.create(sessionId)
MainContainerFragment.create(sessionId)

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down Expand Up @@ -75,7 +78,9 @@ open class BrowserActivity : AppCompatActivity() {
@Suppress("MissingSuperCall", "OVERRIDE_DEPRECATION")
override fun onBackPressed() {
supportFragmentManager.fragments.forEach {
logger.debug("onBackPressed fragment: $it")
if (it is UserInteractionHandler && it.onBackPressed()) {
logger.debug("onBackPressed UserInteractionHandler: $it")
return
}
}
Expand Down
67 changes: 15 additions & 52 deletions app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.compose.ui.platform.ComposeView
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.browser.toolbar.BrowserToolbar
import mozilla.components.compose.browser.toolbar.BrowserToolbar
import mozilla.components.concept.engine.EngineView
import mozilla.components.feature.app.links.AppLinksFeature
import mozilla.components.feature.downloads.DownloadsFeature
Expand All @@ -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 mozilla.components.ui.widgets.behavior.EngineViewScrollingBehavior
import org.mozilla.reference.browser.BuildConfig
import org.mozilla.reference.browser.R
import org.mozilla.reference.browser.addons.WebExtensionPromptFeature
Expand All @@ -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
import mozilla.components.ui.widgets.behavior.ViewPosition as MozacToolbarBehaviorToolbarPosition

/**
* Base fragment extended by [BrowserFragment] and [ExternalAppBrowserFragment].
Expand All @@ -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 toolbarIntegration = ViewBoundFeatureWrapper<ToolbarIntegration>()
private val contextMenuIntegration = ViewBoundFeatureWrapper<ContextMenuIntegration>()
private val downloadsFeature = ViewBoundFeatureWrapper<DownloadsFeature>()
private val shareDownloadsFeature = ViewBoundFeatureWrapper<ShareDownloadFeature>()
Expand All @@ -84,18 +78,15 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit

private val engineView: EngineView
get() = requireView().findViewById<View>(R.id.engineView) as EngineView
private val toolbar: BrowserToolbar
get() = requireView().findViewById(R.id.toolbar)
private val findInPageBar: FindInPageBar
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,

// toolbarIntegration,
sessionFeature,
lastTabFeature,
)
Expand All @@ -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 =
Expand Down Expand Up @@ -161,8 +154,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
return inflater.inflate(R.layout.fragment_browser, container, false)
}

abstract val shouldUseComposeUI: Boolean

@CallSuper
@Suppress("LongMethod")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
Expand All @@ -180,28 +171,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
view = view,
)

(toolbar.layoutParams as? CoordinatorLayout.LayoutParams)?.apply {
behavior = EngineViewScrollingBehavior(
view.context,
null,
MozacToolbarBehaviorToolbarPosition.BOTTOM,
)
}
toolbarIntegration.set(
feature = ToolbarIntegration(
requireContext(),
toolbar,
requireComponents.core.historyStorage,
requireComponents.core.store,
requireComponents.useCases.sessionUseCases,
requireComponents.useCases.tabsUseCases,
requireComponents.useCases.webAppUseCases,
sessionId,
),
owner = this,
view = view,
)

contextMenuIntegration.set(
feature = ContextMenuIntegration(
requireContext(),
Expand Down Expand Up @@ -357,7 +326,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
context,
null,
swipeRefresh,
toolbar.height,
resources.getDimensionPixelSize(R.dimen.browser_toolbar_height),
MozacEngineBehaviorToolbarPosition.BOTTOM,
)
}
Expand Down Expand Up @@ -402,28 +371,21 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
view = view,
)
}

val composeView = view.findViewById<ComposeView>(R.id.compose_view)
if (shouldUseComposeUI) {
composeView.visibility = View.VISIBLE
composeView.setContent { BrowserToolbar() }

val params = swipeRefresh.layoutParams as CoordinatorLayout.LayoutParams
params.topMargin = resources.getDimensionPixelSize(R.dimen.browser_toolbar_height)
swipeRefresh.layoutParams = params
}
}

private fun fullScreenChanged(enabled: Boolean) {
if (enabled) {
activity?.enterImmersiveMode()
toolbar.visibility = View.GONE
engineView.setDynamicToolbarMaxHeight(0)
} else {
activity?.exitImmersiveMode()
toolbar.visibility = View.VISIBLE
engineView.setDynamicToolbarMaxHeight(resources.getDimensionPixelSize(R.dimen.browser_toolbar_height))
}
parentFragment?.parentFragmentManager
?.setFragmentResult(
BROWSER_TO_MAIN_FRAGMENT_RESULT_KEY,
Bundle().apply { putBoolean(FULL_SCREEN_MODE_CHANGED, enabled) }
)
}

private fun viewportFitChanged(viewportFit: Int) {
Expand All @@ -434,7 +396,10 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit

@CallSuper
override fun onBackPressed(): Boolean {
return backButtonHandler.any { it.onBackPressed() }
logger.info("onBackPressed")
return backButtonHandler.any { it.onBackPressed() }.also {
logger.info("Was it handled by back button handlers? $it")
}
}

final override fun onHomePressed(): Boolean {
Expand All @@ -452,16 +417,14 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit
}

companion object {
private const val SESSION_ID = "session_id"

@JvmStatic
protected fun Bundle.putSessionId(sessionId: String?) {
putString(SESSION_ID, sessionId)
}
}

override fun onActivityResult(requestCode: Int, data: Intent?, resultCode: Int): Boolean {
Logger.info(
logger.info(
"Fragment onActivityResult received with " +
"requestCode: $requestCode, resultCode: $resultCode, data: $data",
)
Expand Down
Loading

0 comments on commit bf331b7

Please sign in to comment.