-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Make "bookmark added" dialog specific to that use case #7099
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
CDRussell
merged 1 commit into
develop
from
feature/craig/make_bookmark_added_dialog_less_generic
Nov 19, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
130 changes: 130 additions & 0 deletions
130
app/src/main/java/com/duckduckgo/app/bookmarks/dialog/BookmarkAddedConfirmationDialog.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /* | ||
| * Copyright (c) 2024 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. | ||
| */ | ||
|
|
||
| package com.duckduckgo.app.bookmarks.dialog | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.content.Context | ||
| import android.graphics.Typeface | ||
| import android.text.Spannable | ||
| import android.text.SpannableString | ||
| import android.text.style.StyleSpan | ||
| import android.view.LayoutInflater | ||
| import android.view.WindowManager | ||
| import android.widget.FrameLayout | ||
| import androidx.lifecycle.lifecycleScope | ||
| 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 | ||
| import com.google.android.material.shape.MaterialShapeDrawable | ||
| import com.google.android.material.shape.ShapeAppearanceModel | ||
| import kotlinx.coroutines.delay | ||
| import kotlinx.coroutines.launch | ||
| import com.duckduckgo.mobile.android.R as CommonR | ||
|
|
||
| @SuppressLint("NoBottomSheetDialog") | ||
| class BookmarkAddedConfirmationDialog( | ||
| context: Context, | ||
| private val bookmarkFolder: BookmarkFolder?, | ||
| ) : BottomSheetDialog(context) { | ||
|
|
||
| abstract class EventListener { | ||
| /** Sets a listener to be invoked when favorite state is changed */ | ||
| open fun onFavoriteStateChangeClicked(isFavorited: Boolean) {} | ||
|
|
||
| /** Sets a listener to be invoked when edit bookmarks is clicked */ | ||
| open fun onEditBookmarkClicked() {} | ||
| } | ||
|
|
||
| private var listener: EventListener? = null | ||
|
|
||
| private val binding = BottomSheetAddBookmarkBinding.inflate(LayoutInflater.from(context)) | ||
|
|
||
| private val autoDismissDialogJob = ConflatedJob() | ||
|
|
||
| override fun show() { | ||
| setContentView(binding.root) | ||
|
|
||
| window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND) | ||
| behavior.state = BottomSheetBehavior.STATE_EXPANDED | ||
| behavior.isDraggable = false | ||
| roundCornersAlways(this) | ||
| binding.bookmarksBottomSheetDialogTitle.text = getBookmarksBottomSheetTitle(context, bookmarkFolder) | ||
|
|
||
| binding.setAsFavorite.setOnClickListener { | ||
| cancelDialogAutoDismiss() | ||
| binding.setAsFavoriteSwitch.isChecked = !binding.setAsFavoriteSwitch.isChecked | ||
| listener?.onFavoriteStateChangeClicked(binding.setAsFavoriteSwitch.isChecked) | ||
| } | ||
| binding.setAsFavoriteSwitch.setOnClickListener { | ||
| cancelDialogAutoDismiss() | ||
| listener?.onFavoriteStateChangeClicked(binding.setAsFavoriteSwitch.isChecked) | ||
| } | ||
| binding.editBookmark.setOnClickListener { | ||
| cancelDialogAutoDismiss() | ||
| listener?.onEditBookmarkClicked() | ||
| dismiss() | ||
| } | ||
|
|
||
| autoDismissDialogJob += lifecycleScope.launch { | ||
| delay(BOOKMARKS_BOTTOM_SHEET_DURATION) | ||
| dismiss() | ||
| } | ||
| super.show() | ||
| } | ||
|
|
||
| private fun cancelDialogAutoDismiss() { | ||
| autoDismissDialogJob.cancel() | ||
| } | ||
|
|
||
| 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 spannableString = SpannableString(fullText) | ||
|
|
||
| val boldStart = fullText.indexOf(folderName) | ||
| val boldEnd = boldStart + folderName.length | ||
| spannableString.setSpan(StyleSpan(Typeface.BOLD), boldStart, boldEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) | ||
| return spannableString | ||
| } | ||
|
|
||
| /** Sets event listener for the bottom sheet dialog */ | ||
| fun addEventListener(eventListener: EventListener) { | ||
| listener = eventListener | ||
| } | ||
|
|
||
| // TODO: Use a style when bookmarks is moved to its own module | ||
| private fun roundCornersAlways(dialog: BottomSheetDialog) { | ||
| dialog.setOnShowListener { dialogInterface -> | ||
| val bottomSheetDialog = dialogInterface as BottomSheetDialog | ||
| val bottomSheet = bottomSheetDialog.findViewById<FrameLayout>(R.id.design_bottom_sheet) | ||
| bottomSheet?.background = MaterialShapeDrawable( | ||
| ShapeAppearanceModel.builder().apply { | ||
| setTopLeftCorner(CornerFamily.ROUNDED, context.resources.getDimension(CommonR.dimen.dialogBorderRadius)) | ||
| setTopRightCorner(CornerFamily.ROUNDED, context.resources.getDimension(CommonR.dimen.dialogBorderRadius)) | ||
| }.build(), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| private companion object { | ||
| private const val BOOKMARKS_BOTTOM_SHEET_DURATION = 3_500L | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: why not an interface?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would normally go for
interfacepersonally, but this was porting over existing code (renaming the dialog) so wanted to minimize changes made. It also seems to be fairly consistent with other dialogs/builders, so I just kept it as it was.