Skip to content

Commit

Permalink
Bookmarks: Pixels and Translations (#5479)
Browse files Browse the repository at this point in the history
Task/Issue URL:
https://app.asana.com/0/488551667048375/1209157857304990/f

### Description
PR for pixels and translations

### Steps to test this PR
Verify pixels as per
https://app.asana.com/0/72649045549333/1209105840971963/f

---------

Co-authored-by: Dax The Translator <[email protected]>
  • Loading branch information
malmstein and daxmobile authored Jan 20, 2025
1 parent 14b3793 commit 86b8444
Show file tree
Hide file tree
Showing 33 changed files with 166 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ enum class AppPixelName(override val pixelName: String) : Pixel.PixelName {
MENU_ACTION_FIRE_PRESSED("m_nav_f_p"),
MENU_ACTION_REFRESH_PRESSED("m_nav_r_p"),
MENU_ACTION_NEW_TAB_PRESSED("m_nav_nt_p"),
MENU_ACTION_BOOKMARKS_PRESSED("m_nav_b_p"),
MENU_ACTION_BOOKMARKS_PRESSED("m_navigation_menu_bookmarks"),
MENU_ACTION_NAVIGATE_FORWARD_PRESSED("m_nav_nf_p"),
MENU_ACTION_NAVIGATE_BACK_PRESSED("m_nav_nb_p"),
MENU_ACTION_ADD_BOOKMARK_PRESSED("m_nav_ab_p"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@

<FrameLayout
android:id="@+id/trailingIconContainer"
android:layout_width="@dimen/listItemTrailingIconWidth"
android:layout_width="44dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -122,14 +122,4 @@
tools:ignore="ContentDescription" />
</FrameLayout>

<View
android:id="@+id/endTrailingPadding"
android:layout_width="@dimen/keyline_0"
android:layout_height="0dp"
android:layout_marginEnd="@dimen/keyline_2"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package com.duckduckgo.savedsites.impl
import com.duckduckgo.app.statistics.pixels.Pixel
enum class SavedSitesPixelName(override val pixelName: String) : Pixel.PixelName {
/** Bookmarks Screen **/
MENU_ACTION_BOOKMARKS_PRESSED_DAILY("m_navigation_menu_bookmarks_daily"),
BOOKMARK_IMPORT_SUCCESS("m_bi_s"),
BOOKMARK_IMPORT_ERROR("m_bi_e"),
BOOKMARK_EXPORT_SUCCESS("m_be_a"),
Expand All @@ -42,6 +43,11 @@ enum class SavedSitesPixelName(override val pixelName: String) : Pixel.PixelName
BOOKMARK_MENU_EDIT_BOOKMARK_CLICKED("m_bookmark_menu_edit"),
BOOKMARK_MENU_REMOVE_FAVORITE_CLICKED("m_bookmark_menu_remove_favorite"),
BOOKMARK_MENU_DELETE_BOOKMARK_CLICKED("m_bookmark_menu_delete"),
BOOKMARK_MENU_IMPORT_CLICKED("m_bookmark_menu_import_clicked"),
BOOKMARK_MENU_EXPORT_CLICKED("m_bookmark_menu_export_clicked"),
BOOKMARK_MENU_ADD_FOLDER_CLICKED("m_bookmark_menu_add_folder_clicked"),
BOOKMARK_MENU_SORT_NAME_CLICKED("m_bookmark_menu_sort_name_clicked"),
BOOKMARK_MENU_SORT_MANUAL_CLICKED("m_bookmark_menu_sort_manual_clicked"),

/** New Tab Pixels **/
FAVOURITES_LIST_EXPANDED("m_new_tab_page_favorites_expanded"),
Expand All @@ -55,3 +61,7 @@ enum class SavedSitesPixelName(override val pixelName: String) : Pixel.PixelName
FAVOURITE_REMOVED("m_favorite_removed"),
FAVOURITE_DELETED("m_favorite_deleted"),
}

object SavedSitesPixelParameters {
const val SORT_MODE = "sort_mode"
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ sealed class BookmarkScreenViewHolders(itemView: View) : RecyclerView.ViewHolder
fun bind() {
binding.savedSiteEmptyHintTitle.setText(R.string.bookmarksEmptyHint)
binding.savedSiteEmptyImportButton.setOnClickListener {
viewModel.launchBookmarkImport()
viewModel.onImportBookmarksClicked()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.Confi
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.DeleteBookmarkFolder
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.ExportedSavedSites
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.ImportedSavedSites
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.LaunchAddFolder
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.LaunchBookmarkExport
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.LaunchBookmarkImport
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.LaunchSyncSettings
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.OpenBookmarkFolder
Expand Down Expand Up @@ -185,7 +187,7 @@ class BookmarksActivity : DuckDuckGoActivity(), BookmarksScreenPromotionPlugin.C
showSearchBar()
}
binding.addFolderMenu.setOnClickListener {
launchAddFolder()
viewModel.onAddFolderClicked()
}
binding.appBarLayout.gone()
} else {
Expand Down Expand Up @@ -289,15 +291,15 @@ class BookmarksActivity : DuckDuckGoActivity(), BookmarksScreenPromotionPlugin.C
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.bookmark_import -> {
launchBookmarkImport()
viewModel.onImportBookmarksClicked()
}

R.id.bookmark_export -> {
launchBookmarkExport()
viewModel.onExportBookmarksClicked()
}

R.id.action_add_folder -> {
launchAddFolder()
viewModel.onAddFolderClicked()
}
}
return super.onOptionsItemSelected(item)
Expand Down Expand Up @@ -387,11 +389,13 @@ class BookmarksActivity : DuckDuckGoActivity(), BookmarksScreenPromotionPlugin.C
is ShowEditBookmarkFolder -> editBookmarkFolder(it.bookmarkFolder)
is DeleteBookmarkFolder -> deleteBookmarkFolder(it.bookmarkFolder)
is ConfirmDeleteBookmarkFolder -> confirmDeleteBookmarkFolder(it.bookmarkFolder)
is LaunchBookmarkImport -> launchBookmarkImport()
is ShowFaviconsPrompt -> showFaviconsPrompt()
is LaunchSyncSettings -> launchSyncSettings()
is ReevalutePromotions -> configurePromotionsContainer()
is ShowBrowserMenu -> showBookmarksPopupMenu(it.buttonsDisabled, it.sortingMode)
is LaunchBookmarkImport -> launchBookmarkImport()
is LaunchBookmarkExport -> launchBookmarkExport()
is LaunchAddFolder -> launchAddFolder()
}
}
}
Expand Down Expand Up @@ -559,8 +563,12 @@ class BookmarksActivity : DuckDuckGoActivity(), BookmarksScreenPromotionPlugin.C
onMenuItemClicked(popupBinding.sortManually) {
viewModel.onSortingModeSelected(MANUAL)
}
onMenuItemClicked(popupBinding.importBookmarks) { launchBookmarkImport() }
onMenuItemClicked(popupBinding.exportBookmarks) { launchBookmarkExport() }
onMenuItemClicked(popupBinding.importBookmarks) {
viewModel.onImportBookmarksClicked()
}
onMenuItemClicked(popupBinding.exportBookmarks) {
viewModel.onExportBookmarksClicked()
}
}
popupMenu.show(binding.root, binding.browserMenu)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import com.duckduckgo.savedsites.api.service.ExportSavedSitesResult
import com.duckduckgo.savedsites.api.service.ImportSavedSitesResult
import com.duckduckgo.savedsites.api.service.SavedSitesManager
import com.duckduckgo.savedsites.impl.SavedSitesPixelName
import com.duckduckgo.savedsites.impl.SavedSitesPixelParameters
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksAdapter.BookmarkFolderItem
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksAdapter.BookmarkItem
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksAdapter.BookmarksItemTypes
Expand All @@ -44,6 +45,8 @@ import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.Confi
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.DeleteBookmarkFolder
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.ExportedSavedSites
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.ImportedSavedSites
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.LaunchAddFolder
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.LaunchBookmarkExport
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.LaunchBookmarkImport
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.OpenBookmarkFolder
import com.duckduckgo.savedsites.impl.bookmarks.BookmarksViewModel.Command.OpenSavedSite
Expand Down Expand Up @@ -104,6 +107,8 @@ class BookmarksViewModel @Inject constructor(
data class ImportedSavedSites(val importSavedSitesResult: ImportSavedSitesResult) : Command()
data class ExportedSavedSites(val exportSavedSitesResult: ExportSavedSitesResult) : Command()
data object LaunchBookmarkImport : Command()
data object LaunchBookmarkExport : Command()
data object LaunchAddFolder : Command()
data object ShowFaviconsPrompt : Command()
data object LaunchSyncSettings : Command()
data object ReevalutePromotions : Command()
Expand All @@ -128,6 +133,11 @@ class BookmarksViewModel @Inject constructor(
viewModelScope.launch(dispatcherProvider.io()) {
syncEngine.triggerSync(FEATURE_READ)
}
pixel.fire(
SavedSitesPixelName.MENU_ACTION_BOOKMARKS_PRESSED_DAILY.pixelName,
parameters = mapOf(SavedSitesPixelParameters.SORT_MODE to bookmarksDataStore.getSortingMode().name),
type = Daily(),
)
}

override fun onFavouriteEdited(favorite: Favorite) {
Expand Down Expand Up @@ -211,10 +221,6 @@ class BookmarksViewModel @Inject constructor(
}
}

fun launchBookmarkImport() {
command.value = LaunchBookmarkImport
}

fun importBookmarks(uri: Uri) {
viewModelScope.launch(dispatcherProvider.io()) {
val result = savedSitesManager.import(uri)
Expand Down Expand Up @@ -498,6 +504,25 @@ class BookmarksViewModel @Inject constructor(
sortedItems = sortedBookmarks,
)
}
when (mode) {
NAME -> pixel.fire(SavedSitesPixelName.BOOKMARK_MENU_SORT_NAME_CLICKED)
MANUAL -> pixel.fire(SavedSitesPixelName.BOOKMARK_MENU_SORT_MANUAL_CLICKED)
}
}
}

fun onImportBookmarksClicked() {
pixel.fire(SavedSitesPixelName.BOOKMARK_MENU_IMPORT_CLICKED)
command.value = LaunchBookmarkImport
}

fun onExportBookmarksClicked() {
pixel.fire(SavedSitesPixelName.BOOKMARK_MENU_EXPORT_CLICKED)
command.value = LaunchBookmarkExport
}

fun onAddFolderClicked() {
pixel.fire(SavedSitesPixelName.BOOKMARK_MENU_ADD_FOLDER_CLICKED)
command.value = LaunchAddFolder
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Любими</string>
<string name="bookmarksEmptyHint">Все още няма добавени отметки</string>
<string name="favoritesEmptyHint">Все още няма добавени любими</string>
<string name="popupBookmarksSortManually">Сортиране ръчно</string>
<string name="popupBookmarksSortByName">Сортиране по име</string>
<string name="popupBookmarksPreventReordering">Превключете към ръчно сортиране, за да пренаредите отметките.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Редактиране на отметка</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
<string name="favoritesSectionTitle">Oblíbené</string>
<string name="bookmarksEmptyHint">Zatím nebyly přidány žádné záložky.</string>
<string name="favoritesEmptyHint">Zatím nebyly přidány žádné oblíbené položky</string>
<string name="popupBookmarksSortManually">Seřadit ručně</string>
<string name="popupBookmarksSortByName">Seřadit podle názvu</string>
<string name="popupBookmarksPreventReordering">Pokud chceš změnit uspořádání záložek, přepni na ruční řazení.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Upravit záložku</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Favoritter</string>
<string name="bookmarksEmptyHint">Ingen bogmærker tilføjet endnu</string>
<string name="favoritesEmptyHint">Ingen favoritter tilføjet endnu</string>
<string name="popupBookmarksSortManually">Sortér manuelt</string>
<string name="popupBookmarksSortByName">Sortér efter navn</string>
<string name="popupBookmarksPreventReordering">Skift til manuel sortering for at omarrangere bogmærker.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Rediger bogmærke</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Favoriten</string>
<string name="bookmarksEmptyHint">Noch keine Lesezeichen hinzugefügt</string>
<string name="favoritesEmptyHint">Noch keine Favoriten hinzugefügt</string>
<string name="popupBookmarksSortManually">Manuell sortieren</string>
<string name="popupBookmarksSortByName">Nach Namen sortieren</string>
<string name="popupBookmarksPreventReordering">Wechsle zur manuellen Sortierung, um die Lesezeichen neu anzuordnen.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Lesezeichen bearbeiten</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Αγαπημένα</string>
<string name="bookmarksEmptyHint">Δεν προστέθηκαν σελιδοδείκτες ακόμα</string>
<string name="favoritesEmptyHint">Δεν έχουν προστεθεί ακόμα αγαπημένα</string>
<string name="popupBookmarksSortManually">Μη αυτόματη ταξινόμηση</string>
<string name="popupBookmarksSortByName">Ταξινόμηση κατά όνομα</string>
<string name="popupBookmarksPreventReordering">Αλλάξτε σε μη αυτόματη ταξινόμηση για να αναδιατάξετε τους σελιδοδείκτες.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Επεξεργασία σελιδοδείκτη</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Favoritos</string>
<string name="bookmarksEmptyHint">Aún no se han añadido marcadores</string>
<string name="favoritesEmptyHint">Todavía no se han añadido favoritos</string>
<string name="popupBookmarksSortManually">Ordenar manualmente</string>
<string name="popupBookmarksSortByName">Ordenar por nombre</string>
<string name="popupBookmarksPreventReordering">Cambiar a la ordenación manual para reorganizar los marcadores.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Editar marcador</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Lemmikud</string>
<string name="bookmarksEmptyHint">Järjehoidjaid pole veel lisatud</string>
<string name="favoritesEmptyHint">Lemmikuid pole veel lisatud</string>
<string name="popupBookmarksSortManually">Sorteeri käsitsi</string>
<string name="popupBookmarksSortByName">Sorteeri nime järgi</string>
<string name="popupBookmarksPreventReordering">Järjehoidjate ümberkorraldamiseks lülitage käsitsi sorteerimisele.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Redigeeri järjehoidjat</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Suosikit</string>
<string name="bookmarksEmptyHint">Kirjanmerkkejä ei ole vielä lisätty</string>
<string name="favoritesEmptyHint">Suosikkeja ei ole vielä lisätty</string>
<string name="popupBookmarksSortManually">Lajittele manuaalisesti</string>
<string name="popupBookmarksSortByName">Lajittele nimen mukaan</string>
<string name="popupBookmarksPreventReordering">Vaihda manuaaliseen lajitteluun järjestääksesi kirjanmerkit uudelleen.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Muokkaa kirjanmerkkiä</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Favoris</string>
<string name="bookmarksEmptyHint">Aucun signet ajouté pour le moment</string>
<string name="favoritesEmptyHint">Aucun favori ajouté pour le moment</string>
<string name="popupBookmarksSortManually">Trier manuellement</string>
<string name="popupBookmarksSortByName">Trier par nom</string>
<string name="popupBookmarksPreventReordering">Passez au tri manuel pour réorganiser les favoris.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Modifier le signet</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
<string name="favoritesSectionTitle">Omiljeno</string>
<string name="bookmarksEmptyHint">Još nema dodanih knjižnih oznaka</string>
<string name="favoritesEmptyHint">Još uvijek nema omiljenih stavki</string>
<string name="popupBookmarksSortManually">Sortiraj ručno</string>
<string name="popupBookmarksSortByName">Sortiraj po imenu</string>
<string name="popupBookmarksPreventReordering">U svrhu preuređivanja oznaka, prebaci se na ručno sortiranje.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Uredi knjižnu oznaku</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Kedvencek</string>
<string name="bookmarksEmptyHint">Még nincsenek könyvjelzők hozzáadva</string>
<string name="favoritesEmptyHint">Még nincsenek hozzáadva kedvencek.</string>
<string name="popupBookmarksSortManually">Rendezés manuálisan</string>
<string name="popupBookmarksSortByName">Rendezés név szerint</string>
<string name="popupBookmarksPreventReordering">Válts manuális rendezésre a könyvjelzők átrendezéséhez.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Könyvjelző szerkesztése</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Preferiti</string>
<string name="bookmarksEmptyHint">Non è ancora stato aggiunto nessun segnalibro</string>
<string name="favoritesEmptyHint">Non è stato ancora aggiunto alcun preferito</string>
<string name="popupBookmarksSortManually">Ordina manualmente</string>
<string name="popupBookmarksSortByName">Ordina per nome</string>
<string name="popupBookmarksPreventReordering">Passa all\'ordinamento manuale per riordinare i segnalibri.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Modifica segnalibro</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
<string name="favoritesSectionTitle">Mėgstami</string>
<string name="bookmarksEmptyHint">Žymių dar nepridėta</string>
<string name="favoritesEmptyHint">Mėgstamų dar nepridėta</string>
<string name="popupBookmarksSortManually">Rūšiuoti rankiniu būdu</string>
<string name="popupBookmarksSortByName">Rūšiuoti pagal vardą</string>
<string name="popupBookmarksPreventReordering">Norėdami pertvarkyti žymes, perjunkite į rankinį rūšiavimą.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Redaguoti žymę</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@
<string name="favoritesSectionTitle">Izlase</string>
<string name="bookmarksEmptyHint">Vēl nav pievienota neviena grāmatzīme</string>
<string name="favoritesEmptyHint">Vēl nav pievienota neviena izlase</string>
<string name="popupBookmarksSortManually">Kārtot manuāli</string>
<string name="popupBookmarksSortByName">Kārtot pēc nosaukuma</string>
<string name="popupBookmarksPreventReordering">Pārslēdzies uz manuālu kārtošanu, lai pārkārtotu grāmatzīmes.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Rediģēt grāmatzīmi</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
<string name="favoritesSectionTitle">Favoritter</string>
<string name="bookmarksEmptyHint">Ingen bokmerker lagt til ennå</string>
<string name="favoritesEmptyHint">Ingen favoritter ennå</string>
<string name="popupBookmarksSortManually">Sorter manuelt</string>
<string name="popupBookmarksSortByName">Sorter etter navn</string>
<string name="popupBookmarksPreventReordering">Bytt til manuell sortering for å omorganisere bokmerkene.</string>

<!-- Bookmark folders -->
<string name="bookmarkDialogTitleEdit">Rediger bokmerke</string>
Expand Down
Loading

0 comments on commit 86b8444

Please sign in to comment.