Skip to content

Commit fc06e36

Browse files
committed
Code clean up
1 parent 84e6071 commit fc06e36

File tree

2 files changed

+9
-18
lines changed

2 files changed

+9
-18
lines changed

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherActivity.kt

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -448,18 +448,10 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
448448
when (command) {
449449
is Close -> finishAfterTransition()
450450
is CloseAllTabsRequest -> showCloseAllTabsConfirmation()
451-
is Command.ShareLinks -> {
452-
launchShareMultipleLinkChooser(command.links)
453-
}
454-
is Command.ShareLink -> {
455-
launchShareLinkChooser(command.link, command.title)
456-
}
457-
is Command.BookmarkTabs -> {
458-
showBookmarkTabsConfirmation(command.numTabs)
459-
}
460-
is Command.ShowBookmarkToast -> {
461-
showBookmarkToast(command.numBookmarks)
462-
}
451+
is Command.ShareLinks -> launchShareMultipleLinkChooser(command.links)
452+
is Command.ShareLink -> launchShareLinkChooser(command.link, command.title)
453+
is Command.BookmarkTabsRequest -> showBookmarkTabsConfirmation(command.numTabs)
454+
is Command.ShowBookmarkToast -> showBookmarkToast(command.numBookmarks)
463455
}
464456
}
465457

app/src/main/java/com/duckduckgo/app/tabs/ui/TabSwitcherViewModel.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.duckduckgo.app.tabs.ui
1818

19-
import android.R.attr.mode
2019
import androidx.lifecycle.LiveData
2120
import androidx.lifecycle.ViewModel
2221
import androidx.lifecycle.asLiveData
@@ -34,7 +33,7 @@ import com.duckduckgo.app.tabs.model.TabEntity
3433
import com.duckduckgo.app.tabs.model.TabRepository
3534
import com.duckduckgo.app.tabs.model.TabSwitcherData.LayoutType.GRID
3635
import com.duckduckgo.app.tabs.model.TabSwitcherData.LayoutType.LIST
37-
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.BookmarkTabs
36+
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.BookmarkTabsRequest
3837
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.ShareLink
3938
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.ShareLinks
4039
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.ShowBookmarkToast
@@ -108,7 +107,7 @@ class TabSwitcherViewModel @Inject constructor(
108107
data object CloseAllTabsRequest : Command()
109108
data class ShareLink(val link: String, val title: String) : Command()
110109
data class ShareLinks(val links: List<String>) : Command()
111-
data class BookmarkTabs(val numTabs: Int) : Command()
110+
data class BookmarkTabsRequest(val numTabs: Int) : Command()
112111
data class ShowBookmarkToast(val numBookmarks: Int) : Command()
113112
}
114113

@@ -230,17 +229,17 @@ class TabSwitcherViewModel @Inject constructor(
230229
fun onBookmarkSelectedTabs() {
231230
when (val mode = selectionViewState.value.mode) {
232231
is SelectionViewState.Mode.Normal -> {
233-
command.value = BookmarkTabs(1)
232+
command.value = BookmarkTabsRequest(1)
234233
}
235234

236235
is SelectionViewState.Mode.Selection -> {
237-
command.value = BookmarkTabs(mode.selectedTabs.size)
236+
command.value = BookmarkTabsRequest(mode.selectedTabs.size)
238237
}
239238
}
240239
}
241240

242241
fun onBookmarkAllTabs() {
243-
command.value = BookmarkTabs(tabSwitcherItems.value?.size ?: 0)
242+
command.value = BookmarkTabsRequest(tabSwitcherItems.value?.size ?: 0)
244243
}
245244

246245
fun onSelectionModeRequested() {

0 commit comments

Comments
 (0)