Skip to content

Commit 4c08832

Browse files
committed
Code clean up
1 parent 777a1a1 commit 4c08832

File tree

2 files changed

+8
-17
lines changed

2 files changed

+8
-17
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
@@ -439,18 +439,10 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
439439
when (command) {
440440
is Close -> finishAfterTransition()
441441
is CloseAllTabsRequest -> showCloseAllTabsConfirmation()
442-
is Command.ShareLinks -> {
443-
launchShareMultipleLinkChooser(command.links)
444-
}
445-
is Command.ShareLink -> {
446-
launchShareLinkChooser(command.link, command.title)
447-
}
448-
is Command.BookmarkTabs -> {
449-
showBookmarkTabsConfirmation(command.numTabs)
450-
}
451-
is Command.ShowBookmarkToast -> {
452-
showBookmarkToast(command.numBookmarks)
453-
}
442+
is Command.ShareLinks -> launchShareMultipleLinkChooser(command.links)
443+
is Command.ShareLink -> launchShareLinkChooser(command.link, command.title)
444+
is Command.BookmarkTabsRequest -> showBookmarkTabsConfirmation(command.numTabs)
445+
is Command.ShowBookmarkToast -> showBookmarkToast(command.numBookmarks)
454446
}
455447
}
456448

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

Lines changed: 4 additions & 5 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
@@ -46,7 +45,7 @@ import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.BackBu
4645
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.FabType
4746
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.Mode.Normal
4847
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.SelectionViewState.Mode.Selection
49-
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.BookmarkTabs
48+
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.BookmarkTabsRequest
5049
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.ShareLink
5150
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.ShareLinks
5251
import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.ShowBookmarkToast
@@ -133,7 +132,7 @@ class TabSwitcherViewModel @Inject constructor(
133132
data object CloseAllTabsRequest : Command()
134133
data class ShareLink(val link: String, val title: String) : Command()
135134
data class ShareLinks(val links: List<String>) : Command()
136-
data class BookmarkTabs(val numTabs: Int) : Command()
135+
data class BookmarkTabsRequest(val numTabs: Int) : Command()
137136
data class ShowBookmarkToast(val numBookmarks: Int) : Command()
138137
}
139138

@@ -250,11 +249,11 @@ class TabSwitcherViewModel @Inject constructor(
250249
fun onBookmarkSelectedTabs() {
251250
when (val mode = selectionViewState.value.mode) {
252251
is SelectionViewState.Mode.Normal -> {
253-
command.value = BookmarkTabs(1)
252+
command.value = BookmarkTabsRequest(1)
254253
}
255254

256255
is SelectionViewState.Mode.Selection -> {
257-
command.value = BookmarkTabs(mode.selectedTabs.size)
256+
command.value = BookmarkTabsRequest(mode.selectedTabs.size)
258257
}
259258
}
260259
}

0 commit comments

Comments
 (0)