List mode: Translations

app/src/main/java/com/duckduckgo/app/browser/tabpreview/TabEntityDiffCallback.kt

@@ -38,7 +38,8 @@ class TabEntityDiffCallback(
     ): Boolean {
         return oldItem.tabPreviewFile == newItem.tabPreviewFile &&
             oldItem.viewed == newItem.viewed &&
-            oldItem.title == newItem.title
+            oldItem.title == newItem.title &&
+            oldItem.url == newItem.url
     }
 
     private fun getChangePayload(
@@ -51,6 +52,10 @@ class TabEntityDiffCallback(
             diffBundle.putString(DIFF_KEY_TITLE, newItem.title)
         }
 
+        if (oldItem.url != newItem.url) {
+            diffBundle.putString(DIFF_KEY_URL, newItem.url)
+        }
+
         if (oldItem.viewed != newItem.viewed) {
             diffBundle.putBoolean(DIFF_KEY_VIEWED, newItem.viewed)
         }
@@ -84,6 +89,7 @@ class TabEntityDiffCallback(
 
     companion object {
         const val DIFF_KEY_TITLE = "title"
+        const val DIFF_KEY_URL = "url"
         const val DIFF_KEY_PREVIEW = "previewImage"
         const val DIFF_KEY_VIEWED = "viewed"
     }

app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt

@@ -345,6 +345,9 @@ enum class AppPixelName(override val pixelName: String) : Pixel.PixelName {
     TAB_MANAGER_REARRANGE_BANNER_MANUAL_CLOSED("m_tab_manager_rearrange_banner_manual_closed"),
     TAB_MANAGER_REARRANGE_BANNER_AUTODISMISSED("m_tab_manager_rearrange_banner_autodismissed"),
     TAB_MANAGER_REARRANGE_BANNER_DISPLAYED("m_tab_manager_rearrange_banner_displayed"),
+    TAB_MANAGER_GRID_VIEW_BUTTON_CLICKED("m_tab_manager_grid_view_button_clicked"),
+    TAB_MANAGER_LIST_VIEW_BUTTON_CLICKED("m_tab_manager_list_view_button_clicked"),
+    TAB_MANAGER_VIEW_MODE_TOGGLED_DAILY("m_tab_manager_view_mode_toggled_daily"),
 
     ADD_BOOKMARK_CONFIRM_EDITED("m_add_bookmark_confirm_edit"),
 

app/src/main/java/com/duckduckgo/app/tabs/model/TabDataRepository.kt

@@ -26,6 +26,7 @@ import com.duckduckgo.app.di.AppCoroutineScope
 import com.duckduckgo.app.global.model.Site
 import com.duckduckgo.app.global.model.SiteFactory
 import com.duckduckgo.app.tabs.db.TabsDao
+import com.duckduckgo.app.tabs.model.TabSwitcherData.LayoutType
 import com.duckduckgo.app.tabs.model.TabSwitcherData.UserState
 import com.duckduckgo.app.tabs.store.TabSwitcherDataStore
 import com.duckduckgo.common.utils.ConflatedJob
@@ -193,6 +194,10 @@ class TabDataRepository @Inject constructor(
         tabSwitcherDataStore.setAnnouncementDisplayCount(displayCount)
     }
 
+    override suspend fun setTabLayoutType(layoutType: LayoutType) {
+        tabSwitcherDataStore.setTabLayoutType(layoutType)
+    }
+
     override suspend fun addNewTabAfterExistingTab(
         url: String?,
         tabId: String,

app/src/main/java/com/duckduckgo/app/tabs/store/TabSwitcherDataStore.kt

@@ -23,6 +23,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.duckduckgo.app.tabs.model.TabSwitcherData
+import com.duckduckgo.app.tabs.model.TabSwitcherData.LayoutType
 import com.duckduckgo.app.tabs.model.TabSwitcherData.UserState
 import com.duckduckgo.di.scopes.AppScope
 import com.squareup.anvil.annotations.ContributesBinding
@@ -36,6 +37,7 @@ interface TabSwitcherDataStore {
     suspend fun setUserState(userState: UserState)
     suspend fun setWasAnnouncementDismissed(wasDismissed: Boolean)
     suspend fun setAnnouncementDisplayCount(displayCount: Int)
+    suspend fun setTabLayoutType(layoutType: LayoutType)
 }
 
 @ContributesBinding(AppScope::class)
@@ -46,13 +48,15 @@ class TabSwitcherPrefsDataStore @Inject constructor(
         const val KEY_USER_STATE = "KEY_USER_STATE"
         const val KEY_WAS_ANNOUNCEMENT_DISMISSED = "KEY_WAS_ANNOUNCEMENT_DISMISSED"
         const val KEY_ANNOUNCEMENT_DISPLAY_COUNT = "KEY_ANNOUNCEMENT_DISPLAY_COUNT"
+        const val KEY_LAYOUT_TYPE = "KEY_LAYOUT_TYPE"
     }
 
     override val data: Flow<TabSwitcherData> = store.data.map { preferences ->
         TabSwitcherData(
             userState = UserState.valueOf(preferences[stringPreferencesKey(KEY_USER_STATE)] ?: UserState.UNKNOWN.name),
             wasAnnouncementDismissed = preferences[booleanPreferencesKey(KEY_WAS_ANNOUNCEMENT_DISMISSED)] ?: false,
             announcementDisplayCount = preferences[intPreferencesKey(KEY_ANNOUNCEMENT_DISPLAY_COUNT)] ?: 0,
+            layoutType = LayoutType.valueOf(preferences[stringPreferencesKey(KEY_LAYOUT_TYPE)] ?: LayoutType.GRID.name),
         )
     }
 
@@ -73,4 +77,10 @@ class TabSwitcherPrefsDataStore @Inject constructor(
             preferences[intPreferencesKey(KEY_ANNOUNCEMENT_DISPLAY_COUNT)] = displayCount
         }
     }
+
+    override suspend fun setTabLayoutType(layoutType: LayoutType) {
+        store.edit { preferences ->
+            preferences[stringPreferencesKey(KEY_LAYOUT_TYPE)] = layoutType.name
+        }
+    }
 }

app/src/main/java/com/duckduckgo/app/tabs/ui/TabGridItemDecorator.kt → app/src/main/java/com/duckduckgo/app/tabs/ui/TabItemDecorator.kt

@@ -27,7 +27,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.duckduckgo.common.ui.view.toPx
 import com.duckduckgo.mobile.android.R as CommonR
 
-class TabGridItemDecorator(
+class TabItemDecorator(
     context: Context,
     var selectedTabId: String?,
 ) : RecyclerView.ItemDecoration() {

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

@@ -32,6 +32,7 @@ import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.browser.R
@@ -48,6 +49,7 @@ import com.duckduckgo.app.settings.SettingsActivity
 import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.tabs.model.TabEntity
+import com.duckduckgo.app.tabs.model.TabSwitcherData.LayoutType
 import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command
 import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.Close
 import com.duckduckgo.app.tabs.ui.TabSwitcherViewModel.Command.CloseAllTabsRequest
@@ -63,6 +65,7 @@ import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.launch
 
 @InjectWith(ActivityScope::class)
@@ -114,12 +117,16 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
 
     private var selectedTabId: String? = null
 
+    private lateinit var tabTouchHelper: TabTouchHelper
     private lateinit var tabsRecycler: RecyclerView
-    private lateinit var tabGridItemDecorator: TabGridItemDecorator
+    private lateinit var tabItemDecorator: TabItemDecorator
     private lateinit var toolbar: Toolbar
     private lateinit var announcement: View
     private lateinit var announcementCloseButton: ImageButton
 
+    private var layoutTypeMenuItem: MenuItem? = null
+    private var layoutType: LayoutType? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_tab_switcher)
@@ -151,36 +158,37 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
 
     private fun configureRecycler() {
         val numberColumns = gridViewColumnCalculator.calculateNumberOfColumns(TAB_GRID_COLUMN_WIDTH_DP, TAB_GRID_MAX_COLUMN_COUNT)
-        val layoutManager = GridLayoutManager(this, numberColumns)
-        tabsRecycler.layoutManager = layoutManager
+
+        // the tabs recycler view is initially hidden until we know what type of layout to show
+        tabsRecycler.gone()
         tabsRecycler.adapter = tabsAdapter
 
-        val swipeListener = ItemTouchHelper(
-            TabTouchHelper(
-                numberGridColumns = numberColumns,
-                onTabSwiped = { position -> this.onTabDeleted(position, true) },
-                onTabMoved = this::onTabMoved,
-                onTabDraggingStarted = this::onTabDraggingStarted,
-                onTabDraggingFinished = this::onTabDraggingFinished,
-            ),
+        tabTouchHelper = TabTouchHelper(
+            numberGridColumns = numberColumns,
+            onTabSwiped = { position -> this.onTabDeleted(position, true) },
+            onTabMoved = this::onTabMoved,
+            onTabDraggingStarted = this::onTabDraggingStarted,
+            onTabDraggingFinished = this::onTabDraggingFinished,
         )
+
+        val swipeListener = ItemTouchHelper(tabTouchHelper)
         swipeListener.attachToRecyclerView(tabsRecycler)
 
-        tabGridItemDecorator = TabGridItemDecorator(this, selectedTabId)
-        tabsRecycler.addItemDecoration(tabGridItemDecorator)
+        tabItemDecorator = TabItemDecorator(this, selectedTabId)
+        tabsRecycler.addItemDecoration(tabItemDecorator)
     }
 
     private fun configureObservers() {
         viewModel.tabs.observe(this) { tabs ->
             render(tabs)
 
-            val noTabSelected = tabs.none { it.tabId == tabGridItemDecorator.selectedTabId }
+            val noTabSelected = tabs.none { it.tabId == tabItemDecorator.selectedTabId }
             if (noTabSelected && tabs.isNotEmpty()) {
                 updateTabGridItemDecorator(tabs.last())
             }
         }
         viewModel.activeTab.observe(this) { tab ->
-            if (tab != null && tab.tabId != tabGridItemDecorator.selectedTabId && !tab.deletable) {
+            if (tab != null && tab.tabId != tabItemDecorator.selectedTabId && !tab.deletable) {
                 updateTabGridItemDecorator(tab)
             }
         }
@@ -191,23 +199,71 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
         }
 
         lifecycleScope.launch {
-            viewModel.isFeatureAnnouncementVisible
-                .flowWithLifecycle(lifecycle, Lifecycle.State.STARTED)
-                .collect { isVisible ->
-                    if (isVisible && [email protected]) {
-                        viewModel.onTabFeatureAnnouncementDisplayed()
-                        announcement.show()
-                    } else {
-                        announcement.gone()
-                    }
-                }
+            viewModel.layoutType.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).filterNotNull().collect {
+                updateLayoutType(it)
+            }
+        }
+
+        lifecycleScope.launch {
+            viewModel.isFeatureAnnouncementVisible.flowWithLifecycle(lifecycle, Lifecycle.State.STARTED).collect {
+                updateFeatureAnnouncement(it)
+            }
         }
 
         viewModel.command.observe(this) {
             processCommand(it)
         }
     }
 
+    private fun updateFeatureAnnouncement(isVisible: Boolean) {
+        if (isVisible && [email protected]) {
+            viewModel.onTabFeatureAnnouncementDisplayed()
+            announcement.show()
+        } else {
+            announcement.gone()
+        }
+    }
+
+    private fun updateLayoutType(layoutType: LayoutType) {
+        val scrollState = tabsRecycler.layoutManager?.onSaveInstanceState()
+        this.layoutType = layoutType
+        when (layoutType) {
+            LayoutType.GRID -> {
+                val gridLayoutManager = GridLayoutManager(
+                    this@TabSwitcherActivity,
+                    gridViewColumnCalculator.calculateNumberOfColumns(TAB_GRID_COLUMN_WIDTH_DP, TAB_GRID_MAX_COLUMN_COUNT),
+                )
+                tabsRecycler.layoutManager = gridLayoutManager
+                showListLayoutButton()
+            }
+            LayoutType.LIST -> {
+                tabsRecycler.layoutManager = LinearLayoutManager(this@TabSwitcherActivity)
+                showGridLayoutButton()
+            }
+        }
+
+        tabsAdapter.onLayoutTypeChanged(layoutType)
+        tabTouchHelper.onLayoutTypeChanged(layoutType)
+        tabsRecycler.layoutManager?.onRestoreInstanceState(scrollState)
+        tabsRecycler.show()
+    }
+
+    private fun showGridLayoutButton() {
+        layoutTypeMenuItem?.let { viewModeMenuItem ->
+            viewModeMenuItem.setIcon(R.drawable.ic_grid_view_24)
+            viewModeMenuItem.title = getString(R.string.tabSwitcherGridViewMenu)
+            viewModeMenuItem.setVisible(true)
+        }
+    }
+
+    private fun showListLayoutButton() {
+        layoutTypeMenuItem?.let { viewModeMenuItem ->
+            viewModeMenuItem.setIcon(R.drawable.ic_list_view_24)
+            viewModeMenuItem.title = getString(R.string.tabSwitcherListViewMenu)
+            viewModeMenuItem.setVisible(true)
+        }
+    }
+
     private fun render(tabs: List<TabEntity>) {
         tabsAdapter.updateData(tabs)
 
@@ -234,11 +290,20 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_tab_switcher_activity, menu)
+        layoutTypeMenuItem = menu.findItem(R.id.layoutType)
+
+        when (layoutType) {
+            LayoutType.GRID -> showListLayoutButton()
+            LayoutType.LIST -> showGridLayoutButton()
+            null -> layoutTypeMenuItem?.isVisible = false
+        }
+
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
+            R.id.layoutType -> onLayoutTypeToggled()
             R.id.fire -> onFire()
             R.id.newTab -> onNewTabRequested(fromOverflowMenu = false)
             R.id.newTabOverflow -> onNewTabRequested(fromOverflowMenu = true)
@@ -282,6 +347,10 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
         dialog.show()
     }
 
+    private fun onLayoutTypeToggled() {
+        viewModel.onLayoutTypeToggled()
+    }
+
     override fun onNewTabRequested(fromOverflowMenu: Boolean) {
         clearObserversEarlyToStopViewUpdates()
         launch { viewModel.onNewTabRequested(fromOverflowMenu) }
@@ -294,7 +363,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
     }
 
     private fun updateTabGridItemDecorator(tab: TabEntity) {
-        tabGridItemDecorator.selectedTabId = tab.tabId
+        tabItemDecorator.selectedTabId = tab.tabId
         tabsRecycler.invalidateItemDecorations()
     }
 
@@ -328,7 +397,7 @@ class TabSwitcherActivity : DuckDuckGoActivity(), TabSwitcherListener, Coroutine
     private fun onTabDraggingFinished() {
         tabsAdapter.onDraggingFinished()
 
-        tabsRecycler.addItemDecoration(tabGridItemDecorator)
+        tabsRecycler.addItemDecoration(tabItemDecorator)
     }
 
     private fun onDeletableTab(tab: TabEntity) {