diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/dialog/BookmarkAddedConfirmationDialog.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/dialog/BookmarkAddedConfirmationDialog.kt index daa5b24194ef..9aeb432c1c70 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/dialog/BookmarkAddedConfirmationDialog.kt +++ b/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(R.id.design_bottom_sheet) + val bottomSheet = bottomSheetDialog.findViewById(MaterialR.id.design_bottom_sheet) bottomSheet?.background = MaterialShapeDrawable( ShapeAppearanceModel.builder().apply { setTopLeftCorner(CornerFamily.ROUNDED, context.resources.getDimension(CommonR.dimen.dialogBorderRadius)) diff --git a/app/src/main/res/layout/bottom_sheet_add_bookmark.xml b/app/src/main/res/layout/bottom_sheet_add_bookmark.xml index 5ffdfe33c4a0..84e8e3cf8fff 100644 --- a/app/src/main/res/layout/bottom_sheet_add_bookmark.xml +++ b/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" /> + app:primaryText="@string/addBookmarkDialogEditBookmark" /> \ No newline at end of file diff --git a/app/src/main/res/values/saved-sites-strings.xml b/app/src/main/res/values/saved-sites-strings.xml new file mode 100644 index 000000000000..92fe70a729c3 --- /dev/null +++ b/app/src/main/res/values/saved-sites-strings.xml @@ -0,0 +1,21 @@ + + + + Bookmark added in %1$s + Add to Favorites + Edit Bookmark + \ No newline at end of file diff --git a/browser/browser-ui/src/main/res/values-bg/strings-input-mode.xml b/browser/browser-ui/src/main/res/values-bg/strings-input-mode.xml index f932371f766f..7ee8722df16b 100644 --- a/browser/browser-ui/src/main/res/values-bg/strings-input-mode.xml +++ b/browser/browser-ui/src/main/res/values-bg/strings-input-mode.xml @@ -1,4 +1,5 @@ -