TB 44581 [android]: Cleanup new android compose tab-strip feature (72a28639) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/MenuDialogFragment.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -126,6 +126,7 @@ import com.google.android.material.R as materialR

		import mozilla.components.browser.engine.gecko.GeckoEngineSession
		import android.util.Log
		import org.mozilla.fenix.HomeActivity

		private const val EXPANDED_OFFSET = 56
		private const val HIDING_FRICTION = 0.9f
		@@ -335,7 +336,7 @@ class MenuDialogFragment : BottomSheetDialogFragment() {
		activity?.let { activity ->
		activity.lifecycleScope.launch {
		deleteBrowsingDataController.clearBrowsingDataOnQuit {
		activity.finishAndRemoveTask()
		(activity as HomeActivity).shutDown()
		}
		}
		}

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/CustomTabMenu.kt

+0 −14

Original line number	Diff line number	Diff line
		@@ -221,20 +221,6 @@ internal fun CustomTabMenu(
		state = menuItemState,
		)
		}

		if (shouldShowExtensionsMenu) {
		ExtensionsMenuItem(
		inCustomTab = true,
		isPrivate = isPrivate,
		isExtensionsProcessDisabled = isExtensionsProcessDisabled,
		isExtensionsExpanded = isExtensionsExpanded,
		isAllWebExtensionsDisabled = isAllWebExtensionsDisabled,
		webExtensionMenuCount = webExtensionMenuCount,
		extensionsMenuItemDescription = extensionsMenuDescription,
		onExtensionsMenuClick = onExtensionsMenuClick,
		extensionSubmenu = extensionSubmenu,
		)
		}
		}

		if (!customTabMenuItems.isNullOrEmpty()) {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt

+14 −100

Original line number	Diff line number	Diff line
		@@ -254,17 +254,6 @@ fun MainMenu(
		}
		}

		if (accessPoint == MenuAccessPoint.Home && showBanner) {
		MenuBanner(
		onDismiss = {
		onBannerDismiss()
		},
		onClick = {
		onBannerClick()
		},
		)
		}

		if (showIPProtection) {
		MenuGroup {
		IPProtectionMenuItem(
		@@ -275,22 +264,6 @@ fun MainMenu(
		}
		}

		if (accessPoint == MenuAccessPoint.Home) {
		MenuGroup {
		ExtensionsMenuItem(
		inCustomTab = false,
		isPrivate = isPrivate,
		isExtensionsProcessDisabled = isExtensionsProcessDisabled,
		isExtensionsExpanded = isExtensionsExpanded,
		isAllWebExtensionsDisabled = isAllWebExtensionsDisabled,
		webExtensionMenuCount = webExtensionMenuCount,
		extensionsMenuItemDescription = extensionsMenuItemDescription,
		onExtensionsMenuClick = onExtensionsMenuClick,
		extensionSubmenu = extensionSubmenu,
		)
		}
		}

		if (accessPoint == MenuAccessPoint.Browser) {
		ToolsAndActionsMenuGroup(
		isBookmarked = isBookmarked,
		@@ -325,44 +298,23 @@ fun MainMenu(
		)

		MenuGroup {
		MozillaAccountMenuItem(
		account = account,
		accountState = accountState,
		isPrivate = isPrivate,
		onClick = onMozillaAccountButtonClick,
		)

		MenuItem(
		label = stringResource(id = R.string.browser_menu_settings),
		beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_settings_24),
		onClick = onSettingsButtonClick,
		)
		}

		if (showQuitMenu) {
		QuitMenuGroup(
		onQuitMenuClick = onQuitMenuClick,
		)
		}
		}
		}

		@Composable
		private fun QuitMenuGroup(
		onQuitMenuClick: () -> Unit,
		) {
		MenuGroup {
		MenuItem(
		label = stringResource(
		id = R.string.browser_menu_delete_browsing_data_on_quit,
		stringResource(id = R.string.app_name),
		),
		beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_cross_circle_fill_24),
		beforeIconPainter = painterResource(id = iconsR.drawable.mozac_ic_cross_circle_24),
		state = MenuItemState.WARNING,
		onClick = onQuitMenuClick,
		)
		}
		}
		}

		@Suppress("LongParameterList", "LongMethod", "CognitiveComplexMethod")
		@Composable
		@@ -455,21 +407,9 @@ private fun ToolsAndActionsMenuGroup(
		)
		}

		ExtensionsMenuItem(
		inCustomTab = false,
		isPrivate = isPrivate,
		isExtensionsProcessDisabled = isExtensionsProcessDisabled,
		isExtensionsExpanded = isExtensionsExpanded,
		isAllWebExtensionsDisabled = isAllWebExtensionsDisabled,
		webExtensionMenuCount = webExtensionMenuCount,
		extensionsMenuItemDescription = extensionsMenuItemDescription,
		onExtensionsMenuClick = onExtensionsMenuClick,
		extensionSubmenu = extensionSubmenu,
		)

		if (!moreMenuExpanded) {
		MoreMenuButtonGroup(
		isMoreMenuHighlighted = isMoreMenuHighlighted,
		isMoreMenuHighlighted = false, // This prevents a dot from incorrectly showing e.g. "open in app" is available, even though we disable it.
		onMoreMenuClick = onMoreMenuClick,
		)
		}
		@@ -550,33 +490,20 @@ private fun LibraryMenuGroup(
		.semantics {
		this.collectionInfo = CollectionInfo(
		rowCount = 1,
		columnCount = 4,
		columnCount = 2,
		)
		},
		horizontalArrangement = Arrangement.SpaceEvenly,
		verticalAlignment = Alignment.CenterVertically,
		) {
		LibraryMenuItem(
		modifier = Modifier
		.weight(1f)
		.fillMaxHeight(),
		iconRes = iconsR.drawable.mozac_ic_history_24,
		labelRes = R.string.library_history,
		shape = leftShape,
		index = 0,
		onClick = onHistoryMenuClick,
		)

		Spacer(Modifier.width(spacerWidth))

		LibraryMenuItem(
		modifier = Modifier
		.weight(1f)
		.fillMaxHeight(),
		iconRes = iconsR.drawable.mozac_ic_bookmark_tray_fill_24,
		labelRes = R.string.library_bookmarks,
		shape = middleShape,
		index = 1,
		shape = leftShape,
		index = 0,
		onClick = onBookmarksMenuClick,
		)

		@@ -589,22 +516,9 @@ private fun LibraryMenuGroup(
		isHighlighted = isDownloadHighlighted,
		iconRes = iconsR.drawable.mozac_ic_download_24,
		labelRes = R.string.library_downloads,
		shape = middleShape,
		index = 2,
		onClick = onDownloadsMenuClick,
		)

		Spacer(Modifier.width(spacerWidth))

		LibraryMenuItem(
		modifier = Modifier
		.weight(1f)
		.fillMaxHeight(),
		iconRes = iconsR.drawable.mozac_ic_login_24,
		labelRes = R.string.browser_menu_passwords,
		shape = rightShape,
		index = 3,
		onClick = onPasswordsMenuClick,
		index = 1,
		onClick = onDownloadsMenuClick,
		)
		}
		}

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MenuNavigation.kt

+0 −8

Original line number	Diff line number	Diff line
		@@ -95,14 +95,6 @@ internal fun MenuNavigation(
		onLongClick = { onForwardButtonClick(true) },
		)

		MenuNavItem(
		modifier = Modifier.weight(1f),
		state = state,
		painter = painterResource(id = iconsR.drawable.mozac_ic_share_android_24),
		label = stringResource(id = R.string.browser_menu_share),
		onClick = onShareButtonClick,
		)

		if (isSiteLoading) {
		MenuNavItem(
		modifier = Modifier.weight(1f),

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MoreSettingsSubmenu.kt

+0 −37

Original line number	Diff line number	Diff line
		@@ -59,43 +59,6 @@ internal fun MoreSettingsSubmenu(
		Column(
		verticalArrangement = Arrangement.spacedBy(2.dp),
		) {
		TranslationSection(
		translationInfo = translationInfo,
		isReaderViewActive = isReaderViewActive,
		)
		SummarizationMenuItem(
		summarizationMenuState = summarizationMenuState,
		onSummarizePageMenuExposed = onSummarizePageMenuExposed,
		onSummarizePageClick = onSummarizePageClick,
		)
		MoveToNonPrivateTabMenuItem(
		isPrivate = isPrivate,
		onMoveToNonPrivateTabMenuClick = onMoveToNonPrivateTabMenuClick,
		)
		WebCompatReporterMenuItem(
		isWebCompatReporterSupported = isWebCompatReporterSupported,
		isWebCompatEnabled = isWebCompatEnabled,
		onWebCompatReporterClick = onWebCompatReporterClick,
		)
		ShortcutsSection(
		showShortcuts = showShortcuts,
		isPinned = isPinned,
		onShortcutsMenuClick = onShortcutsMenuClick,
		)
		AddToHomeScreenMenuItem(
		isAddToHomeScreenSupported = isAddToHomeScreenSupported,
		isInstallable = isInstallable,
		onAddToHomeScreenMenuClick = onAddToHomeScreenMenuClick,
		)
		SaveToCollectionMenuItem(
		onSaveToCollectionMenuClick = onSaveToCollectionMenuClick,
		)
		OpenInAppMenuItem(
		hasExternalApp = hasExternalApp,
		externalAppName = externalAppName,
		isOpenInAppMenuHighlighted = isOpenInAppMenuHighlighted,
		onOpenInAppMenuClick = onOpenInAppMenuClick,
		)
		SaveAsPdfMenuItem(
		onSaveAsPDFMenuClick = onSaveAsPDFMenuClick,
		)