Skip to content

Promote find replace dialog to production #20641

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.

Sign up for GitHub

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

Open
lukstbit wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Promote find replace dialog to production #20641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48749d2
Promote find and replace dialog to production
lukstbit Mar 31, 2026
649f4dd
Add minor cleanups to FindAndReplaceFragment
lukstbit Mar 31, 2026
9c2a156
Add warning label to FindAndReplaceFragment
lukstbit Apr 1, 2026
11557b9
Add preference upgrade class to remove find and replace dev setting
lukstbit Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,8 @@ class CardBrowserFragment :
Timber.d("onCreateMenu()")
menuInflater.inflate(R.menu.card_browser, menu)
menu.findItem(R.id.action_search_by_flag).subMenu?.setupFlags()
// note: this menu item is available with and without a selection of items
menu.findItem(R.id.action_find_replace)?.title = TR.sentenceCase.findAndReplace

if (!useSearchView) {
searchItem = menu.findItem(R.id.action_search)
Expand Down Expand Up @@ -562,6 +564,10 @@ class CardBrowserFragment :
showFilteredDeckScreen()
return true
}
R.id.action_find_replace -> {
showFindAndReplaceDialog()
return true
}
}

return false
Expand Down Expand Up @@ -594,11 +600,8 @@ class CardBrowserFragment :
menu.findItem(R.id.action_reschedule_cards).title = TR.sentenceCase.setDueDate
menu.findItem(R.id.action_grade_now).title = TR.sentenceCase.gradeNow

val isFindReplaceEnabled = sharedPrefs().getBoolean(getString(R.string.pref_browser_find_replace), false)
menu.findItem(R.id.action_find_replace).apply {
isVisible = isFindReplaceEnabled
title = TR.browsingFindAndReplace().toSentenceCase(R.string.sentence_find_and_replace)
}
// note: this menu item is available with and without a selection of items
menu.findItem(R.id.action_find_replace)?.title = TR.sentenceCase.findAndReplace

menu.findItem(R.id.action_undo).setupUndo()

Expand Down
7 changes: 6 additions & 1 deletion AnkiDroid/src/main/java/com/ichi2/anki/browser/FindAndReplaceDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
}
}

// TODO maybe get rid of the html tags that come with the backend strings and handle the
// sentence case for TR.browsingReplaceWith()
private fun setupLabels() {
binding.labelFind.text =
HtmlCompat.fromHtml(TR.browsingFind(), HtmlCompat.FROM_HTML_MODE_LEGACY)
Expand Down Expand Up @@ -218,7 +220,10 @@ class FindAndReplaceDialogFragment : AnalyticsDialogFragment() {
): FindAndReplaceDialogFragment {
val file = IdsFile(context.cacheDir, noteIds, "find-replace")
return FindAndReplaceDialogFragment().apply {
arguments = bundleOf(ARG_IDS to file)
arguments =
Bundle().apply {
putParcelable(ARG_IDS, file)
}
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/PreferenceUpgradeService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ object PreferenceUpgradeService {
yield(UpgradeToggleBacksideOnlyControl())
yield(UpgradeThemes())
yield(UpgradeAnswerControls())
yield(RemoveDeveloperFindReplace())
}

/** Returns a list of preference upgrade classes which have not been applied */
Expand Down Expand Up @@ -900,6 +901,14 @@ object PreferenceUpgradeService {
}
}
}

internal class RemoveDeveloperFindReplace : PreferenceUpgrade(28) {
override fun upgrade(preferences: SharedPreferences) {
preferences.edit {
remove("browserFindReplace")
}
}
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions AnkiDroid/src/main/java/com/ichi2/anki/ui/internationalization/SentenceCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ object SentenceCase {

context(_: Fragment)
val toggleSuspend get() = TR.browsingToggleSuspend().toSentenceCase(R.string.sentence_toggle_suspend)

context(_: Fragment)
val findAndReplace get() = TR.browsingFindAndReplace().toSentenceCase(R.string.sentence_find_and_replace)
}

/**
Expand Down
17 changes: 16 additions & 1 deletion AnkiDroid/src/main/res/layout/fragment_find_replace.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,29 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp">

<TextView
android:id="@+id/label_warning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/ic_warning"
android:drawablePadding="4dp"
android:layout_marginHorizontal="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/warning_find_and_replace"
android:textStyle="italic"
/>

<TextView
android:id="@+id/label_find"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toBottomOf="@id/label_warning"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginHorizontal="8dp"
android:layout_marginTop="8dp"
tools:text="Find:"/>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_search_layout"
Expand Down
5 changes: 3 additions & 2 deletions AnkiDroid/src/main/res/menu/card_browser.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@

<item
android:id="@+id/action_find_replace"
android:visible="false"
app:showAsAction="never"/>
app:showAsAction="never"
tools:title="Find and replace"
/>
</menu>
5 changes: 3 additions & 2 deletions AnkiDroid/src/main/res/menu/card_browser_multiselect.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,9 @@

<item
android:id="@+id/action_find_replace"
android:visible="false"
app:showAsAction="never"/>
app:showAsAction="never"
tools:title="Find and replace"
/>

<!-- Delete should be last, if undo is not visible -->
<item
Expand Down
1 change: 1 addition & 0 deletions AnkiDroid/src/main/res/values/02-strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@
<string name="tag_editor_add_feedback">Touch “%2$s” to confirm adding “%1$s”</string>
<string name="tag_editor_add_feedback_existing">Existing tag “%1$s” selected</string>
<string name="tag_already_exists">Tag already exists</string>
<string name="warning_find_and_replace">Consider backing up your collection from DeckPicker before using this option!</string>
<!-- Time spans -->

<!-- Currently only used if exporting APKG fails -->
Expand Down
1 change: 0 additions & 1 deletion AnkiDroid/src/main/res/values/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,6 @@
<string name="pref_corrupt_fsrs_params">debug_corrupt_fsrs_params</string>
<string name="new_congrats_screen_pref_key">new_congrats_screen</string>
<string name="new_reviewer_options_key">newReviewerOptions</string>
<string name="pref_browser_find_replace">browserFindReplace</string>
Comment thread
lukstbit marked this conversation as resolved.
<string name="pref_new_review_reminders">newReviewReminders</string>
<string name="developer_options_enabled_by_user_key">devOptionsEnabledByUser</string>
<string name="pref_cat_wip_key">workInProgressDevOptions</string>
Expand Down
5 changes: 0 additions & 5 deletions AnkiDroid/src/main/res/xml/preferences_developer_options.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,6 @@
android:summary="Not compatible with side-by-side editor"
android:key="@string/dev_card_browser_search_view"
android:defaultValue="false"/>
<SwitchPreferenceCompat
android:title="Find and replace in browser"
android:summary="Caution, this can be very destructive for your collection!"
android:key="@string/pref_browser_find_replace"
android:defaultValue="false"/>
<SwitchPreferenceCompat
android:title="Enable new notifications"
android:key="@string/pref_new_review_reminders"
Expand Down
14 changes: 7 additions & 7 deletions AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,7 @@ class CardBrowserTest : RobolectricTest() {
R.id.action_select_all to true,
R.id.action_open_options to true,
R.id.action_create_filtered_deck to true,
R.id.action_find_replace to false,
R.id.action_find_replace to true,
)

assertMenusEqual(expectedMenuItems, menu)
Expand Down Expand Up @@ -1626,7 +1626,7 @@ class CardBrowserTest : RobolectricTest() {
R.id.action_select_all to true,
R.id.action_open_options to true,
R.id.action_create_filtered_deck to true,
R.id.action_find_replace to false,
R.id.action_find_replace to true,
)

assertMenusEqual(expectedMenuItems, menu)
Expand Down Expand Up @@ -1657,7 +1657,7 @@ class CardBrowserTest : RobolectricTest() {
R.id.action_reset_cards_progress to true,
R.id.action_preview_many to true,
R.id.action_export_selected to true,
R.id.action_find_replace to false,
R.id.action_find_replace to true,
R.id.action_delete_card to true,
R.id.action_undo to true,
)
Expand Down Expand Up @@ -1695,7 +1695,7 @@ class CardBrowserTest : RobolectricTest() {
R.id.action_reset_cards_progress to false,
R.id.action_preview_many to true,
R.id.action_export_selected to false,
R.id.action_find_replace to false,
R.id.action_find_replace to true,
R.id.action_delete_card to false,
R.id.action_undo to true,
)
Expand Down Expand Up @@ -1729,7 +1729,7 @@ class CardBrowserTest : RobolectricTest() {
R.id.action_select_all to true,
R.id.action_open_options to true,
R.id.action_create_filtered_deck to true,
R.id.action_find_replace to false,
R.id.action_find_replace to true,
// Note Editor
R.id.action_save to true,
R.id.action_preview to true,
Expand Down Expand Up @@ -1770,7 +1770,7 @@ class CardBrowserTest : RobolectricTest() {
R.id.action_reset_cards_progress to true,
R.id.action_preview_many to false,
R.id.action_export_selected to true,
R.id.action_find_replace to false,
R.id.action_find_replace to true,
R.id.action_delete_card to true,
R.id.action_undo to true,
// Note Editor
Expand Down Expand Up @@ -1832,7 +1832,7 @@ class CardBrowserTest : RobolectricTest() {
R.id.action_select_all to false,
R.id.action_open_options to true,
R.id.action_create_filtered_deck to true,
R.id.action_find_replace to false,
R.id.action_find_replace to true,
)

assertMenusEqual(expectedMenuItems, menu)
Expand Down
Loading