Skip to content

Commit aa9f4d2

Browse files
0nko0nko
committed
Optimize imports
1 parent a95f2c6 commit aa9f4d2

File tree

9 files changed

+33
-33
lines changed

9 files changed

+33
-33
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@ import com.duckduckgo.app.browser.model.LongPressTarget
143143
import com.duckduckgo.app.browser.navigation.bar.view.BrowserNavigationBarObserver
144144
import com.duckduckgo.app.browser.newtab.NewTabPageProvider
145145
import com.duckduckgo.app.browser.omnibar.Omnibar
146-
import com.duckduckgo.app.browser.omnibar.OmnibarItemPressedListener
147-
import com.duckduckgo.app.browser.omnibar.QueryOrigin
148146
import com.duckduckgo.app.browser.omnibar.Omnibar.FindInPageListener
149147
import com.duckduckgo.app.browser.omnibar.Omnibar.ItemPressedListener
150148
import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
151149
import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
152150
import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
153151
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
152+
import com.duckduckgo.app.browser.omnibar.OmnibarItemPressedListener
153+
import com.duckduckgo.app.browser.omnibar.QueryOrigin
154154
import com.duckduckgo.app.browser.print.PrintDocumentAdapterFactory
155155
import com.duckduckgo.app.browser.print.PrintInjector
156156
import com.duckduckgo.app.browser.remotemessage.SharePromoLinkRMFBroadCastReceiver

‎app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayout.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ import com.duckduckgo.app.browser.SmoothProgressAnimator
5757
import com.duckduckgo.app.browser.animations.AddressBarTrackersAnimationFeatureToggle
5858
import com.duckduckgo.app.browser.databinding.IncludeCustomTabToolbarBinding
5959
import com.duckduckgo.app.browser.databinding.IncludeFindInPageBinding
60+
import com.duckduckgo.app.browser.omnibar.Omnibar.InputScreenLaunchListener
61+
import com.duckduckgo.app.browser.omnibar.Omnibar.ItemPressedListener
62+
import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
63+
import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
64+
import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
65+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
6066
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.Command
6167
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.Command.LaunchInputScreen
6268
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.Command.MoveCaretToFront
@@ -78,13 +84,7 @@ import com.duckduckgo.app.browser.omnibar.model.Decoration.LaunchTrackersAnimati
7884
import com.duckduckgo.app.browser.omnibar.model.Decoration.Mode
7985
import com.duckduckgo.app.browser.omnibar.model.Decoration.PrivacyShieldChanged
8086
import com.duckduckgo.app.browser.omnibar.model.Decoration.QueueCookiesAnimation
81-
import com.duckduckgo.app.browser.omnibar.Omnibar.InputScreenLaunchListener
82-
import com.duckduckgo.app.browser.omnibar.Omnibar.ItemPressedListener
83-
import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
84-
import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
8587
import com.duckduckgo.app.browser.omnibar.model.StateChange
86-
import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
87-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
8888
import com.duckduckgo.app.global.view.renderIfChanged
8989
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentManager
9090
import com.duckduckgo.app.statistics.pixels.Pixel

‎app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarLayoutViewModel.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ import com.duckduckgo.anvil.annotations.ContributesViewModel
2424
import com.duckduckgo.app.browser.AddressDisplayFormatter
2525
import com.duckduckgo.app.browser.DuckDuckGoUrlDetector
2626
import com.duckduckgo.app.browser.defaultbrowsing.prompts.AdditionalDefaultBrowserPrompts
27+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
28+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Browser
29+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.CustomTab
30+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Error
31+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.MaliciousSiteWarning
32+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.NewTab
33+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.SSLWarning
2734
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.LeadingIconState.Dax
2835
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.LeadingIconState.DuckPlayer
2936
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.LeadingIconState.EasterEggLogo
@@ -36,13 +43,6 @@ import com.duckduckgo.app.browser.omnibar.model.Decoration.LaunchCookiesAnimatio
3643
import com.duckduckgo.app.browser.omnibar.model.Decoration.LaunchTrackersAnimation
3744
import com.duckduckgo.app.browser.omnibar.model.StateChange
3845
import com.duckduckgo.app.browser.omnibar.model.StateChange.OmnibarStateChange
39-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
40-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Browser
41-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.CustomTab
42-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Error
43-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.MaliciousSiteWarning
44-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.NewTab
45-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.SSLWarning
4646
import com.duckduckgo.app.browser.viewstate.HighlightableButton
4747
import com.duckduckgo.app.browser.viewstate.LoadingViewState
4848
import com.duckduckgo.app.browser.viewstate.OmnibarViewState

‎app/src/main/java/com/duckduckgo/app/browser/omnibar/OmnibarView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import android.widget.ImageView
2121
import androidx.appcompat.widget.Toolbar
2222
import com.airbnb.lottie.LottieAnimationView
2323
import com.duckduckgo.app.browser.databinding.IncludeFindInPageBinding
24-
import com.duckduckgo.app.browser.omnibar.model.Decoration
2524
import com.duckduckgo.app.browser.omnibar.Omnibar.InputScreenLaunchListener
2625
import com.duckduckgo.app.browser.omnibar.Omnibar.ItemPressedListener
2726
import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
28-
import com.duckduckgo.app.browser.omnibar.model.StateChange
2927
import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
28+
import com.duckduckgo.app.browser.omnibar.model.Decoration
29+
import com.duckduckgo.app.browser.omnibar.model.StateChange
3030
import com.duckduckgo.browser.ui.omnibar.OmnibarPosition
3131
import com.duckduckgo.common.ui.view.KeyboardAwareEditText
3232
import kotlinx.coroutines.flow.Flow

‎app/src/main/java/com/duckduckgo/app/browser/omnibar/SingleOmnibarLayout.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import androidx.core.view.isVisible
2929
import androidx.core.view.updateLayoutParams
3030
import com.duckduckgo.anvil.annotations.InjectWith
3131
import com.duckduckgo.app.browser.R
32-
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.ViewState
3332
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
33+
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.ViewState
3434
import com.duckduckgo.browser.ui.omnibar.OmnibarPosition
3535
import com.duckduckgo.common.ui.view.addBottomShadow
3636
import com.duckduckgo.common.ui.view.gone

‎app/src/main/java/com/duckduckgo/app/browser/omnibar/UnifiedOmnibarLayout.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@ import com.duckduckgo.app.browser.SmoothProgressAnimator
6262
import com.duckduckgo.app.browser.animations.AddressBarTrackersAnimationFeatureToggle
6363
import com.duckduckgo.app.browser.databinding.IncludeCustomTabToolbarBinding
6464
import com.duckduckgo.app.browser.databinding.IncludeFindInPageBinding
65+
import com.duckduckgo.app.browser.omnibar.Omnibar.InputScreenLaunchListener
66+
import com.duckduckgo.app.browser.omnibar.Omnibar.ItemPressedListener
67+
import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
68+
import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
69+
import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
70+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
6571
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.Command
6672
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.Command.LaunchInputScreen
6773
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.Command.MoveCaretToFront
@@ -83,13 +89,7 @@ import com.duckduckgo.app.browser.omnibar.model.Decoration.LaunchTrackersAnimati
8389
import com.duckduckgo.app.browser.omnibar.model.Decoration.Mode
8490
import com.duckduckgo.app.browser.omnibar.model.Decoration.PrivacyShieldChanged
8591
import com.duckduckgo.app.browser.omnibar.model.Decoration.QueueCookiesAnimation
86-
import com.duckduckgo.app.browser.omnibar.Omnibar.InputScreenLaunchListener
87-
import com.duckduckgo.app.browser.omnibar.Omnibar.ItemPressedListener
88-
import com.duckduckgo.app.browser.omnibar.Omnibar.LogoClickListener
89-
import com.duckduckgo.app.browser.omnibar.Omnibar.OmnibarTextState
9092
import com.duckduckgo.app.browser.omnibar.model.StateChange
91-
import com.duckduckgo.app.browser.omnibar.Omnibar.TextListener
92-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
9393
import com.duckduckgo.app.global.view.renderIfChanged
9494
import com.duckduckgo.app.onboardingdesignexperiment.OnboardingDesignExperimentManager
9595
import com.duckduckgo.app.statistics.pixels.Pixel

‎app/src/main/java/com/duckduckgo/app/browser/omnibar/UnifiedOmnibarViewModel.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ import com.duckduckgo.anvil.annotations.ContributesViewModel
2424
import com.duckduckgo.app.browser.AddressDisplayFormatter
2525
import com.duckduckgo.app.browser.DuckDuckGoUrlDetector
2626
import com.duckduckgo.app.browser.defaultbrowsing.prompts.AdditionalDefaultBrowserPrompts
27+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
28+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Browser
29+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.CustomTab
30+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Error
31+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.MaliciousSiteWarning
32+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.NewTab
33+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.SSLWarning
2734
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.LeadingIconState.Dax
2835
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.LeadingIconState.DuckPlayer
2936
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.LeadingIconState.EasterEggLogo
@@ -35,13 +42,6 @@ import com.duckduckgo.app.browser.omnibar.model.Decoration.LaunchCookiesAnimatio
3542
import com.duckduckgo.app.browser.omnibar.model.Decoration.LaunchTrackersAnimation
3643
import com.duckduckgo.app.browser.omnibar.model.StateChange
3744
import com.duckduckgo.app.browser.omnibar.model.StateChange.OmnibarStateChange
38-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
39-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Browser
40-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.CustomTab
41-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.Error
42-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.MaliciousSiteWarning
43-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.NewTab
44-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode.SSLWarning
4545
import com.duckduckgo.app.browser.viewstate.HighlightableButton
4646
import com.duckduckgo.app.browser.viewstate.LoadingViewState
4747
import com.duckduckgo.app.browser.viewstate.OmnibarViewState

‎app/src/test/java/com/duckduckgo/app/browser/omnibar/OmnibarLayoutViewModelTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import app.cash.turbine.test
77
import com.duckduckgo.app.browser.AddressDisplayFormatter
88
import com.duckduckgo.app.browser.DuckDuckGoUrlDetectorImpl
99
import com.duckduckgo.app.browser.defaultbrowsing.prompts.AdditionalDefaultBrowserPrompts
10+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
1011
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.Command
1112
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.Command.LaunchInputScreen
1213
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.LeadingIconState
1314
import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.LeadingIconState.Search
1415
import com.duckduckgo.app.browser.omnibar.model.Decoration
1516
import com.duckduckgo.app.browser.omnibar.model.Decoration.ChangeCustomTabTitle
1617
import com.duckduckgo.app.browser.omnibar.model.StateChange
17-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
1818
import com.duckduckgo.app.browser.viewstate.HighlightableButton
1919
import com.duckduckgo.app.browser.viewstate.LoadingViewState
2020
import com.duckduckgo.app.browser.viewstate.OmnibarViewState

‎app/src/test/java/com/duckduckgo/app/browser/omnibar/UnifiedLayoutViewModelTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import app.cash.turbine.test
77
import com.duckduckgo.app.browser.AddressDisplayFormatter
88
import com.duckduckgo.app.browser.DuckDuckGoUrlDetectorImpl
99
import com.duckduckgo.app.browser.defaultbrowsing.prompts.AdditionalDefaultBrowserPrompts
10+
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
1011
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.Command
1112
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.Command.LaunchInputScreen
1213
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.LeadingIconState
1314
import com.duckduckgo.app.browser.omnibar.UnifiedOmnibarViewModel.LeadingIconState.Search
1415
import com.duckduckgo.app.browser.omnibar.model.Decoration
1516
import com.duckduckgo.app.browser.omnibar.model.Decoration.ChangeCustomTabTitle
1617
import com.duckduckgo.app.browser.omnibar.model.StateChange
17-
import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
1818
import com.duckduckgo.app.browser.viewstate.HighlightableButton
1919
import com.duckduckgo.app.browser.viewstate.LoadingViewState
2020
import com.duckduckgo.app.browser.viewstate.OmnibarViewState

0 commit comments

Comments
 (0)