Move strings to correct module for bookmark added dialog

Author: CDRussell

app/src/main/java/com/duckduckgo/app/bookmarks/dialog/BookmarkAddedConfirmationDialog.kt

@@ -26,10 +26,10 @@ import android.view.LayoutInflater
 import android.view.WindowManager
 import android.widget.FrameLayout
 import androidx.lifecycle.lifecycleScope
+import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.browser.databinding.BottomSheetAddBookmarkBinding
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.savedsites.api.models.BookmarkFolder
-import com.google.android.material.R
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.shape.CornerFamily
@@ -38,6 +38,7 @@ import com.google.android.material.shape.ShapeAppearanceModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import com.duckduckgo.mobile.android.R as CommonR
+import com.google.android.material.R as MaterialR
 
 @SuppressLint("NoBottomSheetDialog")
 class BookmarkAddedConfirmationDialog(
@@ -96,7 +97,8 @@ class BookmarkAddedConfirmationDialog(
 
     private fun getBookmarksBottomSheetTitle(context: Context, bookmarkFolder: BookmarkFolder?): SpannableString {
         val folderName = bookmarkFolder?.name ?: ""
-        val fullText = context.getString(com.duckduckgo.saved.sites.impl.R.string.bookmarkAddedInBookmarks, folderName)
+
+        val fullText = context.getString(R.string.addBookmarkDialogBookmarkAddedInFolder, folderName)
         val spannableString = SpannableString(fullText)
 
         val boldStart = fullText.indexOf(folderName)
@@ -114,7 +116,7 @@ class BookmarkAddedConfirmationDialog(
     private fun roundCornersAlways(dialog: BottomSheetDialog) {
         dialog.setOnShowListener { dialogInterface ->
             val bottomSheetDialog = dialogInterface as BottomSheetDialog
-            val bottomSheet = bottomSheetDialog.findViewById<FrameLayout>(R.id.design_bottom_sheet)
+            val bottomSheet = bottomSheetDialog.findViewById<FrameLayout>(MaterialR.id.design_bottom_sheet)
             bottomSheet?.background = MaterialShapeDrawable(
                 ShapeAppearanceModel.builder().apply {
                     setTopLeftCorner(CornerFamily.ROUNDED, context.resources.getDimension(CommonR.dimen.dialogBorderRadius))

app/src/main/res/layout/bottom_sheet_add_bookmark.xml

@@ -44,7 +44,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:leadingIconBackground="circular"
-            app:primaryText="@string/addToFavorites"
+            app:primaryText="@string/addBookmarkDialogAddToFavorites"
             app:leadingIcon="@drawable/ic_favorite_24" />
 
         <com.duckduckgo.common.ui.view.DaxSwitch
@@ -62,6 +62,6 @@
         android:layout_height="wrap_content"
         app:leadingIcon="@drawable/ic_edit_24"
         app:leadingIconBackground="circular"
-        app:primaryText="@string/editBookmark" />
+        app:primaryText="@string/addBookmarkDialogEditBookmark" />
 
 </LinearLayout>

app/src/main/res/values/strings-saved-sites.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2025 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="addBookmarkDialogBookmarkAddedInFolder" instruction="%1$s is the folder name">Bookmark added in %1$s</string>
+    <string name="addBookmarkDialogAddToFavorites">Add to Favorites</string>
+    <string name="addBookmarkDialogEditBookmark">Edit Bookmark</string>
+</resources>

saved-sites/saved-sites-impl/src/main/res/values-bg/strings-saved-sites.xml

@@ -79,7 +79,6 @@
     <string name="searchBookmarks">Търсене на отметки</string>
     <string name="deleteFolder" instruction="%1$s is the folder name">"Изтриване на %1$s?"</string>
     <string name="deleteBookmark" instruction="%1$s is the bookmark name">"Изтриване на %1$s отметки?"</string>
-    <string name="bookmarkAddedInBookmarks" instruction="%1$s is the folder name">Отметката е добавена в %1$s</string>
     <string name="addToFavorites">Добавяне към любими</string>
     <string name="editBookmark">Редактиране на отметка</string>
     <string name="importBookmarksDescription">Ако имате запазени отметки в друг браузър, можете\nда ги импортирате в DuckDuckGo.</string>

saved-sites/saved-sites-impl/src/main/res/values-cs/strings-saved-sites.xml

@@ -85,7 +85,6 @@
     <string name="searchBookmarks">Prohledat záložky</string>
     <string name="deleteFolder" instruction="%1$s is the folder name">"Smazat složku %1$s?"</string>
     <string name="deleteBookmark" instruction="%1$s is the bookmark name">"Smazat záložku %1$s?"</string>
-    <string name="bookmarkAddedInBookmarks" instruction="%1$s is the folder name">Záložku jsme přidali do složky %1$s</string>
     <string name="addToFavorites">Přidat do oblíbených</string>
     <string name="editBookmark">Upravit záložku</string>
     <string name="importBookmarksDescription">Pokud máš záložky uložené v jiném prohlížeči, \nmůžeš je importovat do DuckDuckGo.</string>

saved-sites/saved-sites-impl/src/main/res/values-da/strings-saved-sites.xml

@@ -79,7 +79,6 @@
     <string name="searchBookmarks">Søg i bogmærker</string>
     <string name="deleteFolder" instruction="%1$s is the folder name">"Slet %1$s?"</string>
     <string name="deleteBookmark" instruction="%1$s is the bookmark name">"Slet bogmærket %1$s?"</string>
-    <string name="bookmarkAddedInBookmarks" instruction="%1$s is the folder name">Bogmærke tilføjet i %1$s.</string>
     <string name="addToFavorites">Tilføj til favoritter</string>
     <string name="editBookmark">Rediger bogmærke</string>
     <string name="importBookmarksDescription">Hvis dine bogmærker er gemt i en anden browser, kan du\nimportere dem til DuckDuckGo.</string>

saved-sites/saved-sites-impl/src/main/res/values-de/strings-saved-sites.xml

@@ -79,7 +79,6 @@
     <string name="searchBookmarks">Lesezeichen durchsuchen</string>
     <string name="deleteFolder" instruction="%1$s is the folder name">"%1$s löschen?"</string>
     <string name="deleteBookmark" instruction="%1$s is the bookmark name">"Lesezeichen %1$s löschen?"</string>
-    <string name="bookmarkAddedInBookmarks" instruction="%1$s is the folder name">Lesezeichen zu %1$s hinzugefügt</string>
     <string name="addToFavorites">Zu Favoriten hinzufügen</string>
     <string name="editBookmark">Lesezeichen bearbeiten</string>
     <string name="importBookmarksDescription">Wenn deine Lesezeichen in einem anderen Browser gespeichert sind,\nkannst du sie in DuckDuckGo importieren.</string>

saved-sites/saved-sites-impl/src/main/res/values-el/strings-saved-sites.xml

@@ -79,7 +79,6 @@
     <string name="searchBookmarks">Αναζήτηση σελιδοδεικτών</string>
     <string name="deleteFolder" instruction="%1$s is the folder name">"Διαγραφή %1$s;"</string>
     <string name="deleteBookmark" instruction="%1$s is the bookmark name">"Διαγραφή σελιδοδείκτη %1$s;"</string>
-    <string name="bookmarkAddedInBookmarks" instruction="%1$s is the folder name">Ο σελιδοδείκτης προστέθηκε στο %1$s</string>
     <string name="addToFavorites">Προσθήκη στα Αγαπημένα</string>
     <string name="editBookmark">Επεξεργασία σελιδοδείκτη</string>
     <string name="importBookmarksDescription">Εάν οι σελιδοδείκτες σας είναι αποθηκευμένοι σε άλλο πρόγραμμα περιήγησης, \nμπορείτε να τους εισάγετε στο DuckDuckGo.</string>

saved-sites/saved-sites-impl/src/main/res/values-es/strings-saved-sites.xml

@@ -79,7 +79,6 @@
     <string name="searchBookmarks">Buscar marcadores</string>
     <string name="deleteFolder" instruction="%1$s is the folder name">"¿Eliminar %1$s?"</string>
     <string name="deleteBookmark" instruction="%1$s is the bookmark name">"¿Borrar marcador %1$s?"</string>
-    <string name="bookmarkAddedInBookmarks" instruction="%1$s is the folder name">Marcador añadido en %1$s</string>
     <string name="addToFavorites">Añadir a favoritos</string>
     <string name="editBookmark">Editar marcador</string>
     <string name="importBookmarksDescription">Si tus marcadores se guardan en otro navegador, puedes importarlos a DuckDuckGo.</string>

saved-sites/saved-sites-impl/src/main/res/values-et/strings-saved-sites.xml

@@ -79,7 +79,6 @@
     <string name="searchBookmarks">Otsi järjehoidjaid</string>
     <string name="deleteFolder" instruction="%1$s is the folder name">"Kas kustutada %1$s?"</string>
     <string name="deleteBookmark" instruction="%1$s is the bookmark name">"Kas kustutada järjehoidja %1$s?"</string>
-    <string name="bookmarkAddedInBookmarks" instruction="%1$s is the folder name">Järjehoidja lisati kausta %1$s</string>
     <string name="addToFavorites">Lisa lemmikutesse</string>
     <string name="editBookmark">Redigeeri järjehoidjat</string>
     <string name="importBookmarksDescription">Kui sinu järjehoidjad on salvestatud mõnes teises brauseris,\nsaad need importida DuckDuckGosse.</string>