From 3a0a6a4d483e36a3f9a67ba6c1a0cebb747bace9 Mon Sep 17 00:00:00 2001 From: Craig Russell Date: Mon, 22 Jul 2024 13:11:53 +0100 Subject: [PATCH] Enforce legacy UX for new tab and focussed view --- .../com/duckduckgo/app/browser/newtab/FocusedViewProvider.kt | 3 +++ .../com/duckduckgo/app/browser/newtab/NewTabPageProvider.kt | 1 + .../src/main/java/com/duckduckgo/newtabpage/impl/NewTabPage.kt | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/duckduckgo/app/browser/newtab/FocusedViewProvider.kt b/app/src/main/java/com/duckduckgo/app/browser/newtab/FocusedViewProvider.kt index e00f22387477..0ed14717b3b6 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/newtab/FocusedViewProvider.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/newtab/FocusedViewProvider.kt @@ -49,6 +49,7 @@ class RealFocusedViewProvider @Inject constructor( @ContributesActivePlugin( scope = ActivityScope::class, boundType = FocusedViewPlugin::class, + priority = 0, ) class FocusedLegacyPage @Inject constructor() : FocusedViewPlugin { @@ -62,6 +63,8 @@ class FocusedLegacyPage @Inject constructor() : FocusedViewPlugin { @ContributesActivePlugin( scope = ActivityScope::class, boundType = FocusedViewPlugin::class, + priority = 100, + defaultActiveValue = false, ) class FocusedPage @Inject constructor() : FocusedViewPlugin { diff --git a/app/src/main/java/com/duckduckgo/app/browser/newtab/NewTabPageProvider.kt b/app/src/main/java/com/duckduckgo/app/browser/newtab/NewTabPageProvider.kt index 5379e5794c2d..fd54f7636354 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/newtab/NewTabPageProvider.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/newtab/NewTabPageProvider.kt @@ -48,6 +48,7 @@ class RealNewTabPageProvider @Inject constructor( @ContributesActivePlugin( scope = AppScope::class, boundType = NewTabPagePlugin::class, + priority = 0, ) class NewTabLegacyPage @Inject constructor() : NewTabPagePlugin { diff --git a/new-tab-page/new-tab-page-impl/src/main/java/com/duckduckgo/newtabpage/impl/NewTabPage.kt b/new-tab-page/new-tab-page-impl/src/main/java/com/duckduckgo/newtabpage/impl/NewTabPage.kt index be51307f4b01..f69049cd2314 100644 --- a/new-tab-page/new-tab-page-impl/src/main/java/com/duckduckgo/newtabpage/impl/NewTabPage.kt +++ b/new-tab-page/new-tab-page-impl/src/main/java/com/duckduckgo/newtabpage/impl/NewTabPage.kt @@ -28,7 +28,8 @@ import javax.inject.Inject @ContributesActivePlugin( scope = AppScope::class, boundType = NewTabPagePlugin::class, - priority = 100, // higher to come last in the list of plugins + priority = 100, // higher to come last in the list of plugins, + defaultActiveValue = false, ) class NewTabPage @Inject constructor() : NewTabPagePlugin {