Skip to content

Commit 4fc9c46

Browse files
mikescamellmikescamell
committed
formatting
1 parent 9a0763e commit 4fc9c46

File tree

13 files changed

+47
-44
lines changed

13 files changed

+47
-44
lines changed

‎app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,6 @@ import com.duckduckgo.app.onboarding.store.OnboardingStore
168168
import com.duckduckgo.app.onboarding.store.UserStageStore
169169
import com.duckduckgo.app.onboarding.ui.page.extendedonboarding.ExtendedOnboardingFeatureToggles
170170
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentManager
171-
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentToggles
172-
import com.duckduckgo.app.pixels.AppPixelName
173171
import com.duckduckgo.app.pixels.AppPixelName.AUTOCOMPLETE_BANNER_SHOWN
174172
import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_ALWAYS_DUCK_PLAYER
175173
import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_ALWAYS_OVERLAY_YOUTUBE
@@ -290,9 +288,7 @@ import com.duckduckgo.subscriptions.api.SubscriptionRebrandingFeatureToggle
290288
import com.duckduckgo.subscriptions.api.Subscriptions
291289
import com.duckduckgo.subscriptions.api.SubscriptionsJSHelper
292290
import com.duckduckgo.sync.api.favicons.FaviconsFetchingPrompt
293-
import com.duckduckgo.voice.api.VoiceSearchAvailability
294291
import com.duckduckgo.voice.api.VoiceSearchAvailabilityPixelLogger
295-
import dagger.Lazy
296292
import java.io.File
297293
import java.math.BigInteger
298294
import java.security.cert.X509Certificate
@@ -6643,7 +6639,7 @@ class BrowserTabViewModelTest {
66436639
}
66446640

66456641
@Test
6646-
fun whenSetOnboardingDialogBackgroundWithBuckOnboardingEnabledAndLightModeEnabledThenSetOnboardingDialogBackgroundColorCommandIssuedWithCorrectColor() {
6642+
fun whenSetOnboardingDialogBackgroundWithBuckOnboardingAndLightModeEnabledThenSetOnboardingDialogBackgroundColorCommandIssuedWithCorrectColor() {
66476643
whenever(mockOnboardingDesignExperimentManager.isBuckEnrolledAndEnabled()).thenReturn(true)
66486644

66496645
testee.setOnboardingDialogBackground(lightModeEnabled = true)
@@ -6654,7 +6650,7 @@ class BrowserTabViewModelTest {
66546650
}
66556651

66566652
@Test
6657-
fun whenSetOnboardingDialogBackgroundWithBuckOnboardingEnabledAndDarkModeEnabledThenSetOnboardingDialogBackgroundColorCommandIssuedWithCorrectColor() {
6653+
fun whenSetOnboardingDialogBackgroundWithBuckOnboardinAndDarkModeEnabledThenSetOnboardingDialogBackgroundColorCommandIssuedWithCorrectColor() {
66586654
whenever(mockOnboardingDesignExperimentManager.isBuckEnrolledAndEnabled()).thenReturn(true)
66596655

66606656
testee.setOnboardingDialogBackground(lightModeEnabled = false)
@@ -6938,7 +6934,6 @@ class BrowserTabViewModelTest {
69386934
verify(mockOnboardingDesignExperimentManager).fireSiteSuggestionOptionSelectedPixel(1)
69396935
}
69406936

6941-
69426937
@Test
69436938
fun whenUserSubmittedQueryNotSuggestedSearchOptionThenFireSearchOrNavCustomPixel() = runTest {
69446939
whenever(mockOmnibarConverter.convertQueryToUrl("custom query", null)).thenReturn("custom query")

‎app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ import com.duckduckgo.app.global.view.NonDismissibleBehavior
198198
import com.duckduckgo.app.global.view.launchDefaultAppActivity
199199
import com.duckduckgo.app.global.view.renderIfChanged
200200
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentManager
201-
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentToggles
202201
import com.duckduckgo.app.pixels.AppPixelName
203202
import com.duckduckgo.app.settings.db.SettingsDataStore
204203
import com.duckduckgo.app.statistics.pixels.Pixel

‎app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ import com.duckduckgo.app.global.model.domain
239239
import com.duckduckgo.app.global.model.domainMatchesUrl
240240
import com.duckduckgo.app.location.data.LocationPermissionType
241241
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentManager
242-
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentToggles
243242
import com.duckduckgo.app.pixels.AppPixelName
244243
import com.duckduckgo.app.pixels.AppPixelName.AUTOCOMPLETE_BANNER_DISMISSED
245244
import com.duckduckgo.app.pixels.AppPixelName.AUTOCOMPLETE_BANNER_SHOWN

‎app/src/main/java/com/duckduckgo/app/cta/ui/Cta.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ sealed class OnboardingDaxDialogCta(
447447
override val appInstallStore: AppInstallStore,
448448
val trackers: List<Entity>,
449449
val settingsDataStore: SettingsDataStore,
450-
private val onboardingDesignExperimentManager : OnboardingDesignExperimentManager,
450+
private val onboardingDesignExperimentManager: OnboardingDesignExperimentManager,
451451
) : OnboardingDaxDialogCta(
452452
CtaId.DAX_DIALOG_TRACKERS_FOUND,
453453
null,
@@ -550,7 +550,7 @@ sealed class OnboardingDaxDialogCta(
550550
override val appInstallStore: AppInstallStore,
551551
val network: String,
552552
private val siteHost: String,
553-
private val onboardingDesignExperimentManager : OnboardingDesignExperimentManager,
553+
private val onboardingDesignExperimentManager: OnboardingDesignExperimentManager,
554554
) : OnboardingDaxDialogCta(
555555
CtaId.DAX_DIALOG_NETWORK,
556556
null,
@@ -631,7 +631,7 @@ sealed class OnboardingDaxDialogCta(
631631
class DaxNoTrackersCta(
632632
override val onboardingStore: OnboardingStore,
633633
override val appInstallStore: AppInstallStore,
634-
private val onboardingDesignExperimentManager : OnboardingDesignExperimentManager,
634+
private val onboardingDesignExperimentManager: OnboardingDesignExperimentManager,
635635
) : OnboardingDaxDialogCta(
636636
CtaId.DAX_DIALOG_OTHER,
637637
R.string.daxNonSerpCtaText,
@@ -753,7 +753,7 @@ sealed class OnboardingDaxDialogCta(
753753
class DaxSiteSuggestionsCta(
754754
override val onboardingStore: OnboardingStore,
755755
override val appInstallStore: AppInstallStore,
756-
private val onboardingDesignExperimentManager : OnboardingDesignExperimentManager,
756+
private val onboardingDesignExperimentManager: OnboardingDesignExperimentManager,
757757
private val onSiteSuggestionOptionClicked: (index: Int) -> Unit, // used to fire experiment pixel
758758
) : OnboardingDaxDialogCta(
759759
CtaId.DAX_INTRO_VISIT_SITE,
@@ -783,7 +783,7 @@ sealed class OnboardingDaxDialogCta(
783783
onSuggestedOptionClicked = { option, index ->
784784
onSuggestedOptionClicked?.invoke(option)
785785
onSiteSuggestionOptionClicked.invoke(index)
786-
}
786+
},
787787
)
788788
}
789789
onboardingDesignExperimentManager.isBbEnrolledAndEnabled() -> {
@@ -1031,7 +1031,7 @@ sealed class OnboardingDaxDialogCta(
10311031
class DaxEndCta(
10321032
override val onboardingStore: OnboardingStore,
10331033
override val appInstallStore: AppInstallStore,
1034-
private val onboardingDesignExperimentManager : OnboardingDesignExperimentManager,
1034+
private val onboardingDesignExperimentManager: OnboardingDesignExperimentManager,
10351035
) : OnboardingDaxDialogCta(
10361036
CtaId.DAX_END,
10371037
R.string.highlightsOnboardingEndDaxDialogDescription,
@@ -1057,7 +1057,7 @@ sealed class OnboardingDaxDialogCta(
10571057
val context = binding.root.context
10581058

10591059
when {
1060-
onboardingDesignExperimentManager.isBuckEnrolledAndEnabled()-> {
1060+
onboardingDesignExperimentManager.isBuckEnrolledAndEnabled() -> {
10611061
setBuckOnboardingDialogView(
10621062
message = description?.let { context.getString(it) }.orEmpty(),
10631063
primaryCtaText = buttonText?.let { context.getString(it) },

‎app/src/main/java/com/duckduckgo/app/cta/ui/CtaViewModel.kt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,12 @@ class CtaViewModel @Inject constructor(
225225
suspend fun getSiteSuggestionsDialogCta(onSiteSuggestionOptionClicked: (index: Int) -> Unit): OnboardingDaxDialogCta? {
226226
return withContext(dispatchers.io()) {
227227
if (!daxOnboardingActive() || !canShowDaxIntroVisitSiteCta()) return@withContext null
228-
OnboardingDaxDialogCta.DaxSiteSuggestionsCta(onboardingStore, appInstallStore, onboardingDesignExperimentManager, onSiteSuggestionOptionClicked)
228+
OnboardingDaxDialogCta.DaxSiteSuggestionsCta(
229+
onboardingStore,
230+
appInstallStore,
231+
onboardingDesignExperimentManager,
232+
onSiteSuggestionOptionClicked,
233+
)
229234
}
230235
}
231236

‎app/src/main/java/com/duckduckgo/app/onboardingdesignexperiment/OnboardingDesignExperimentCountDataStore.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ private const val KEY_SERP_VISIT_COUNT = "serp_visit_count"
4343
@ContributesBinding(AppScope::class)
4444
@SingleInstanceIn(AppScope::class)
4545
class SharedPreferencesOnboardingDesignExperimentCountDataStore @Inject constructor(
46-
private val dispatcherProvider: DispatcherProvider,
47-
@OnboardingVisitCount private val store: DataStore<Preferences>,
46+
private val dispatcherProvider: DispatcherProvider,
47+
@OnboardingVisitCount private val store: DataStore<Preferences>,
4848
) : OnboardingDesignExperimentCountDataStore {
4949

5050
override suspend fun increaseSiteVisitCount(): Int {

‎app/src/main/java/com/duckduckgo/app/onboardingdesignexperiment/OnboardingDesignExperimentManager.kt‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ import com.duckduckgo.feature.toggles.api.MetricsPixel
3737
import com.duckduckgo.privacy.config.api.PrivacyConfigCallbackPlugin
3838
import com.squareup.anvil.annotations.ContributesBinding
3939
import com.squareup.anvil.annotations.ContributesMultibinding
40+
import javax.inject.Inject
4041
import kotlinx.coroutines.CoroutineScope
4142
import kotlinx.coroutines.launch
4243
import kotlinx.coroutines.withContext
43-
import javax.inject.Inject
4444

4545
interface OnboardingDesignExperimentManager {
4646
suspend fun enroll()
@@ -186,17 +186,17 @@ class RealOnboardingDesignExperimentManager @Inject constructor(
186186
}
187187

188188
override suspend fun fireInContextDialogShownPixel(cta: Cta?) {
189-
when(cta) {
189+
when (cta) {
190190
is DaxBubbleCta -> {
191-
when(cta) {
191+
when (cta) {
192192
is DaxBubbleCta.DaxIntroSearchOptionsCta -> fireTryASearchDisplayedPixel()
193193
is DaxBubbleCta.DaxIntroVisitSiteOptionsCta -> fireVisitSitePromptDisplayedNewTabPixel()
194194
is DaxBubbleCta.DaxEndCta -> fireFinalOnboardingScreenDisplayedPixel()
195195
is DaxBubbleCta.DaxPrivacyProCta -> Unit // No pixel for this CTA
196196
}
197197
}
198-
is OnboardingDaxDialogCta ->{
199-
when(cta) {
198+
is OnboardingDaxDialogCta -> {
199+
when (cta) {
200200
is OnboardingDaxDialogCta.DaxSerpCta -> fireMessageOnSerpDisplayedPixel()
201201
is OnboardingDaxDialogCta.DaxSiteSuggestionsCta -> fireVisitSitePromptDisplayedAdjacentPixel()
202202
is OnboardingDaxDialogCta.DaxTrackersBlockedCta -> fireTrackersBlockedMessageDisplayedPixel()
@@ -213,32 +213,33 @@ class RealOnboardingDesignExperimentManager @Inject constructor(
213213
cta: Cta,
214214
index: Int,
215215
) {
216-
when(cta) {
216+
when (cta) {
217217
is DaxBubbleCta.DaxIntroSearchOptionsCta -> {
218-
when(index) {
218+
when (index) {
219219
0 -> fireFirstSearchSuggestionPixel()
220220
1 -> fireSecondSearchSuggestionPixel()
221221
2 -> fireThirdSearchSuggestionPixel()
222222
else -> Unit // only 3 options are available
223223
}
224224
}
225225
is DaxBubbleCta.DaxIntroVisitSiteOptionsCta,
226-
is OnboardingDaxDialogCta.DaxSiteSuggestionsCta -> fireSiteSuggestionOptionSelectedPixel(index)
226+
is OnboardingDaxDialogCta.DaxSiteSuggestionsCta,
227+
-> fireSiteSuggestionOptionSelectedPixel(index)
227228
}
228229
}
229230

230231
override suspend fun fireSiteSuggestionOptionSelectedPixel(index: Int) {
231-
when(index) {
232-
0 -> fireFirstSiteSuggestionPixel()
233-
1 -> fireSecondSiteSuggestionPixel()
234-
2 -> fireThirdSiteSuggestionPixel()
235-
else -> Unit // only 3 options are available
236-
}
232+
when (index) {
233+
0 -> fireFirstSiteSuggestionPixel()
234+
1 -> fireSecondSiteSuggestionPixel()
235+
2 -> fireThirdSiteSuggestionPixel()
236+
else -> Unit // only 3 options are available
237+
}
237238
}
238239

239240
override suspend fun onWebPageFinishedLoading(url: String?) {
240241
if (url == null) return
241-
if(duckDuckGoUrlDetector.isDuckDuckGoUrl(url)) {
242+
if (duckDuckGoUrlDetector.isDuckDuckGoUrl(url)) {
242243
fireSecondSerpVisitPixel()
243244
} else {
244245
fireSecondSiteVisitPixel()

‎app/src/test/java/com/duckduckgo/app/cta/ui/CtaTest.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import com.duckduckgo.app.trackerdetection.model.Entity
3434
import com.duckduckgo.app.trackerdetection.model.TrackerStatus
3535
import com.duckduckgo.app.trackerdetection.model.TrackerType
3636
import com.duckduckgo.app.trackerdetection.model.TrackingEvent
37-
import com.duckduckgo.feature.toggles.api.Toggle
3837
import java.util.concurrent.TimeUnit
3938
import org.junit.Assert.assertEquals
4039
import org.junit.Assert.assertFalse
@@ -44,7 +43,6 @@ import org.junit.Test
4443
import org.mockito.Mock
4544
import org.mockito.MockitoAnnotations
4645
import org.mockito.kotlin.any
47-
import org.mockito.kotlin.doReturn
4846
import org.mockito.kotlin.mock
4947
import org.mockito.kotlin.whenever
5048

‎app/src/test/java/com/duckduckgo/app/onboarding/onboardingdesignexperiment/OnboardingDesignExperimentManagerTest.kt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ class OnboardingDesignExperimentManagerTest {
166166
whenever(onboardingDesignExperimentToggles.onboardingDesignExperimentAug25()).thenReturn(mockToggle)
167167
whenever(mockToggle.isEnabled()).thenReturn(true)
168168
whenever(mockToggle.getCohort()).thenReturn(mockCohort)
169-
whenever(mockToggle.getCohort()!!.name).thenReturn(OnboardingDesignExperimentToggles.OnboardingDesignExperimentCohort.MODIFIED_CONTROL.cohortName)
169+
whenever(mockToggle.getCohort()!!.name).thenReturn(
170+
OnboardingDesignExperimentToggles.OnboardingDesignExperimentCohort.MODIFIED_CONTROL.cohortName,
171+
)
170172

171173
whenever(appBuildConfig.sdkInt).thenReturn(33)
172174
whenever(appBuildConfig.isAppReinstall()).thenReturn(false)
@@ -383,7 +385,9 @@ class OnboardingDesignExperimentManagerTest {
383385

384386
@Test
385387
fun whenFireInContextDialogShownPixelWithDaxTrackersBlockedCtaThenCorrectPixelFired() = runTest {
386-
testee.fireInContextDialogShownPixel(OnboardingDaxDialogCta.DaxTrackersBlockedCta(onboardingStore, appInstallStore, emptyList(), settingsDataStore, testee))
388+
testee.fireInContextDialogShownPixel(
389+
OnboardingDaxDialogCta.DaxTrackersBlockedCta(onboardingStore, appInstallStore, emptyList(), settingsDataStore, testee),
390+
)
387391
verify(onboardingExperimentMetricsPixelPlugin).getTrackersBlockedMessageDisplayedMetric()
388392
}
389393

@@ -395,7 +399,9 @@ class OnboardingDesignExperimentManagerTest {
395399

396400
@Test
397401
fun whenFireInContextDialogShownPixelWithDaxMainNetworkCtaThenCorrectPixelFired() = runTest {
398-
testee.fireInContextDialogShownPixel(OnboardingDaxDialogCta.DaxMainNetworkCta(onboardingStore, appInstallStore, "Facebook", "facebook.com", testee))
402+
testee.fireInContextDialogShownPixel(
403+
OnboardingDaxDialogCta.DaxMainNetworkCta(onboardingStore, appInstallStore, "Facebook", "facebook.com", testee),
404+
)
399405
verify(onboardingExperimentMetricsPixelPlugin).getTrackerNetworkMessageDisplayedMetric()
400406
}
401407

‎app/src/test/java/com/duckduckgo/app/onboarding/ui/page/WelcomePageViewModelTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ class WelcomePageViewModelTest {
155155

156156
@Test
157157
fun givenComparisonChartDialogWhenDDGIsDefaultBrowserThenFireChooseBrowserPixel() = runTest {
158-
whenever(mockDefaultRoleBrowserDialog.shouldShowDialog()).thenReturn(false)
158+
whenever(mockDefaultRoleBrowserDialog.shouldShowDialog()).thenReturn(false)
159159
testee.onPrimaryCtaClicked(PreOnboardingDialogType.COMPARISON_CHART)
160160

161161
verify(mockOnboardingDesignExperimentManager).fireChooseBrowserPixel()

0 commit comments

Comments
 (0)