Skip to content

Consolidate desktop browser promo screens into one shared module #9565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
catalinradoiu wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Consolidate desktop browser promo screens into one shared module #9565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,9 @@ dependencies {
implementation project(':settings-api')
implementation project(':settings-impl')

implementation project(':desktop-app-promotion-api')
implementation project(':desktop-app-promotion-impl')

implementation project(':broken-site-api')
implementation project(':broken-site-impl')
implementation project(':broken-site-store')
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,6 @@
android:exported="false"
android:label="@string/aboutActivityTitle"
android:parentActivityName="com.duckduckgo.app.settings.SettingsActivity" />
<activity
android:name="com.duckduckgo.app.desktopbrowser.GetDesktopBrowserActivity"
android:exported="false"
android:label="@string/getDesktopBrowserSettingItemTitle"
android:parentActivityName="com.duckduckgo.app.settings.SettingsActivity" />
<activity
android:name="com.duckduckgo.app.fire.fireproofwebsite.ui.FireproofWebsitesActivity"
android:exported="false"
Expand Down Expand Up @@ -550,10 +545,6 @@

<receiver android:name=".shortcut.ShortcutReceiver" android:exported="false" />

<receiver
android:name="com.duckduckgo.app.desktopbrowser.GetDesktopBrowserShareBroadcastReceiver"
android:exported="false" />

<receiver
android:name="com.duckduckgo.widget.SearchWidget"
android:exported="false"
Expand Down
198 changes: 0 additions & 198 deletions app/src/main/java/com/duckduckgo/app/desktopbrowser/GetDesktopBrowserActivity.kt
View file
Open in desktop

This file was deleted.

118 changes: 0 additions & 118 deletions app/src/main/java/com/duckduckgo/app/desktopbrowser/GetDesktopBrowserViewModel.kt
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions app/src/main/java/com/duckduckgo/app/settings/GetDesktopBrowserCompleteSetupSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.lifecycle.findViewTreeLifecycleOwner
import androidx.lifecycle.lifecycleScope
import com.duckduckgo.anvil.annotations.PriorityKey
import com.duckduckgo.app.browser.R
import com.duckduckgo.app.desktopbrowser.GetDesktopBrowserActivityParams
import com.duckduckgo.app.pixels.AppPixelName
import com.duckduckgo.app.settings.db.SettingsDataStore
import com.duckduckgo.app.statistics.pixels.Pixel
Expand Down Expand Up @@ -99,9 +98,7 @@ class GetDesktopBrowserCompleteSetupSettings @Inject constructor(

val intent = globalActivityStarter.startIntent(
activity,
GetDesktopBrowserActivityParams(
source = GetDesktopBrowserActivityParams.Source.COMPLETE_SETUP,
),
SettingsDesktopBrowserPromotionParams.forCompleteSetupCard(),
) ?: return@launch

setOnClickListener {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import com.duckduckgo.app.browser.BrowserActivity
import com.duckduckgo.app.browser.R
import com.duckduckgo.app.browser.databinding.ActivitySettingsNewBinding
import com.duckduckgo.app.browser.mode.InAppNavigation
import com.duckduckgo.app.desktopbrowser.GetDesktopBrowserActivityParams
import com.duckduckgo.app.email.ui.EmailProtectionUnsupportedScreenNoParams
import com.duckduckgo.app.firebutton.DataClearingSettingsScreenNoParams
import com.duckduckgo.app.generalsettings.GeneralSettingsScreenNoParams
Expand Down Expand Up @@ -554,7 +553,7 @@ class SettingsActivity : DuckDuckGoActivity() {
is LaunchOtherPlatforms -> launchActivityAndFinish(
BrowserActivity.intent(context = this, launchSource = InAppNavigation, queryExtra = OTHER_PLATFORMS_URL),
)
is Command.LaunchGetDesktopBrowser -> launchScreen(GetDesktopBrowserActivityParams(source = GetDesktopBrowserActivityParams.Source.OTHER))
is Command.LaunchGetDesktopBrowser -> launchScreen(SettingsDesktopBrowserPromotionParams.forSettingsListItem())
is Command.LaunchWhatsNew -> launchScreen(ModalSurfaceActivityFromMessageId(it.messageId, it.messageType, launchedFromSettings = true))
}
}
Expand Down
Loading
Loading