Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android

Commits: c48c9424 by clairehurst at 2023-10-03T16:00:40+00:00 fixup! Modify UI/UX

- - - - -

5 changed files:

- fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt - fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt - fenix/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt

Changes:

===================================== fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt ===================================== @@ -164,7 +164,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { view = view, )

- if (context.settings().shouldShowOpenInAppCfr) { + if (false) { // context.settings().shouldShowOpenInAppCfr openInAppOnboardingObserver.set( feature = OpenInAppOnboardingObserver( context = context,

===================================== fenix/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt ===================================== @@ -66,7 +66,7 @@ class OpenInAppOnboardingObserver( currentUrl = tab.content.url } else { // Loading state has changed - maybeShowOpenInAppBanner(tab.content.url, tab.content.loading) +// maybeShowOpenInAppBanner(tab.content.url, tab.content.loading) } } }

===================================== fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt ===================================== @@ -373,7 +373,7 @@ open class DefaultToolbarMenu( findInPageItem, desktopSiteItem, customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization }, - openInApp.apply { visible = ::shouldShowOpenInApp }, +// openInApp.apply { visible = ::shouldShowOpenInApp }, //reportSiteIssuePlaceholder, BrowserMenuDivider(), // addToHomeScreenItem.apply { visible = ::canAddToHomescreen },

===================================== fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt ===================================== @@ -122,7 +122,7 @@ class CustomTabToolbarMenu( BrowserMenuDivider().apply { visible = { !isSandboxCustomTab } }, desktopMode, findInPage, - openInApp.apply { visible = ::shouldShowOpenInApp }, +// openInApp.apply { visible = ::shouldShowOpenInApp }, openInFenix.apply { visible = { !isSandboxCustomTab } }, BrowserMenuDivider(), menuToolbar,

===================================== fenix/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt ===================================== @@ -70,6 +70,7 @@ class DynamicDownloadDialog( )

binding.downloadDialogActionButton.apply { + visibility = View.VISIBLE text = context.getString( mozilla.components.feature.downloads.R.string.mozac_feature_downloads_button_try_again, ) @@ -90,6 +91,7 @@ class DynamicDownloadDialog( )

binding.downloadDialogActionButton.apply { + visibility = View.GONE text = context.getString( mozilla.components.feature.downloads.R.string.mozac_feature_downloads_button_open, )

View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/c48c...