Skip to content

Commit ca72063

Browse files
committed
Code clean up
1 parent 5857d12 commit ca72063

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
@@ -447,18 +447,10 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
447447
when (command) {
448448
is Close -> finishAfterTransition()
449449
is CloseAllTabsRequest -> showCloseAllTabsConfirmation()
450-
is Command.ShareLinks -> {
451-
launchShareMultipleLinkChooser(command.links)
452-
}
453-
is Command.ShareLink -> {
454-
launchShareLinkChooser(command.link, command.title)
455-
}
456-
is Command.BookmarkTabs -> {
457-
showBookmarkTabsConfirmation(command.numTabs)
458-
}
459-
is Command.ShowBookmarkToast -> {
460-
showBookmarkToast(command.numBookmarks)
461-
}
450+
is Command.ShareLinks -> launchShareMultipleLinkChooser(command.links)
451+
is Command.ShareLink -> launchShareLinkChooser(command.link, command.title)
452+
is Command.BookmarkTabsRequest -> showBookmarkTabsConfirmation(command.numTabs)
453+
is Command.ShowBookmarkToast -> showBookmarkToast(command.numBookmarks)
462454
}
463455
}
464456

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
@@ -112,7 +111,7 @@ class TabSwitcherViewModel @Inject constructor(
112111
data object CloseAllTabsRequest : Command()
113112
data class ShareLink(val link: String, val title: String) : Command()
114113
data class ShareLinks(val links: List<String>) : Command()
115-
data class BookmarkTabs(val numTabs: Int) : Command()
114+
data class BookmarkTabsRequest(val numTabs: Int) : Command()
116115
data class ShowBookmarkToast(val numBookmarks: Int) : Command()
117116
}
118117

@@ -238,17 +237,17 @@ class TabSwitcherViewModel @Inject constructor(
238237
fun onBookmarkSelectedTabs() {
239238
when (val mode = selectionViewState.value.mode) {
240239
is SelectionViewState.Mode.Normal -> {
241-
command.value = BookmarkTabs(1)
240+
command.value = BookmarkTabsRequest(1)
242241
}
243242

244243
is SelectionViewState.Mode.Selection -> {
245-
command.value = BookmarkTabs(mode.selectedTabs.size)
244+
command.value = BookmarkTabsRequest(mode.selectedTabs.size)
246245
}
247246
}
248247
}
249248

250249
fun onBookmarkAllTabs() {
251-
command.value = BookmarkTabs(tabSwitcherItems.value?.size ?: 0)
250+
command.value = BookmarkTabsRequest(tabSwitcherItems.value?.size ?: 0)
252251
}
253252

254253
fun onSelectionModeRequested() {

0 commit comments

Comments
 (0)