Add help icon to the sync error dialog by Fandroid745 · Pull Request #20147 · ankidroid/Anki-Android

Fandroid745 · 2026-01-18T11:03:21Z

Purpose / Description

Add help icon to the sync dialog in order to avoid confusion for users.

Fixes

This fixes #17544

Approach

1.SyncErrorDialog.kt :Refactored the DIALOG_SYNC_CONFLICT_RESOLUTION block to use the titleWithHelpIcon extension from AlertDialogFacade.kt

2.AlertDialogFacade.kt: Updated the extension function to use optional icon parameter.

3.alert_dialog_with_xml :Added the title_icon ImageView to alert_dialog_title_with_help.xml and added adjustment so that the title aligns when no icon is present.

4.Constants.xml: added the link_sync_conflict_help string pointing to the url: https://docs.ankiweb.net/syncing.html#conflicts

How Has This Been Tested?

Ran the app on the phone
and verified that the sync dialog shows both the dialog icon on the left and the help_icon on the right.
Verified that the icons are visible on both light and dark theme.

Checklist

Please, go through these checks before submitting the PR.

You have a descriptive commit message with a short title (first line, max 50 chars).
You have performed a self-review of your own code
UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
(https://play.google.com/store/apps/details?id=com.google.android.apps.accessibility.auditor)

screen-20260118-164024.mp4

david-allison

Thanks!!!

There's lots of changes which don't seem relevant to the PR (maxLines), and lots of line noise

I would expect in the layout:

Add the icon to the left of the screen
add a constraint on the icon
add 'end' padding on the icon

david-allison · 2026-01-18T11:18:19Z

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt

-                    }.setNegativeButton(R.string.sync_conflict_keep_remote_new) { _, _ ->
-                        requireSyncErrorDialogListener().showSyncErrorDialog(DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_REMOTE)
-                    }.setNeutralButton(R.string.dialog_cancel) { _, _ ->
+                AlertDialog.Builder(requireContext()).create {


In this case, continue to use dialog: have titleWithHelpIcon return this

I have reverted the unecessary changes and added the changes you requested in the layout.
but the dialog looks like this now
is this fine?

Here's a before and after with my changes:

Index: AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml b/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml --- a/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml (revision 0c3c88c1659c1eec012fcc20f8e498497eed03e0) +++ b/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml (revision 6a54c83ee785b0a6062742c669274b953f80c9d4) @@ -14,7 +14,6 @@ android:id="@+id/title_icon" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginEnd="12dp" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@android:id/title" @@ -29,6 +28,8 @@ android:layout_height="wrap_content" android:textAppearance="?attr/textAppearanceHeadlineSmall" android:textColor="?attr/colorOnSurface" + android:layout_marginStart="12dp" + app:layout_goneMarginStart="0dp" app:layout_constraintEnd_toStartOf="@+id/help_icon" app:layout_constraintStart_toEndOf="@+id/title_icon" app:layout_constraintTop_toTopOf="parent"

This is almost there.

Check to see what's going on with the title, I may have made a mistake with the size, or it may be dynamic based on content to fit a line

Maintain the 'old' color, we'll handle these in:

Define theme surface/container colors #18767

The margin is wrong, there should be more space between the icon and the title

Not sure if you're still working on this, or the push was a nudge for me to re-review.

Still pending on an investigation of the title

david-allison

Thanks!!

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt

AnkiDroid/src/main/java/com/ichi2/utils/AlertDialogFacade.kt

AnkiDroid/src/main/res/values/constants.xml

david-allison · 2026-01-19T10:24:14Z

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt

-                    }.setNegativeButton(R.string.sync_conflict_keep_remote_new) { _, _ ->
-                        requireSyncErrorDialogListener().showSyncErrorDialog(DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_REMOTE)
-                    }.setNeutralButton(R.string.dialog_cancel) { _, _ ->
+                AlertDialog.Builder(requireContext()).create {


Here's a before and after with my changes:

Index: AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== diff --git a/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml b/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml --- a/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml (revision 0c3c88c1659c1eec012fcc20f8e498497eed03e0) +++ b/AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml (revision 6a54c83ee785b0a6062742c669274b953f80c9d4) @@ -14,7 +14,6 @@ android:id="@+id/title_icon" android:layout_width="24dp" android:layout_height="24dp" - android:layout_marginEnd="12dp" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@android:id/title" @@ -29,6 +28,8 @@ android:layout_height="wrap_content" android:textAppearance="?attr/textAppearanceHeadlineSmall" android:textColor="?attr/colorOnSurface" + android:layout_marginStart="12dp" + app:layout_goneMarginStart="0dp" app:layout_constraintEnd_toStartOf="@+id/help_icon" app:layout_constraintStart_toEndOf="@+id/title_icon" app:layout_constraintTop_toTopOf="parent"

This is almost there.

Check to see what's going on with the title, I may have made a mistake with the size, or it may be dynamic based on content to fit a line

Maintain the 'old' color, we'll handle these in:

Define theme surface/container colors #18767

The margin is wrong, there should be more space between the icon and the title

Fandroid745 · 2026-01-19T14:23:57Z

I have made the changes you asked.
I renamed the resource string to link_sync_conflict_help from sync_conflict_url, and I ran the app on my phone the dialog now matches what you have shared in your comment.

david-allison · 2026-01-19T14:40:22Z

The title height has changed from the original dialog (also in my screenshot)

Check to see what's going on with the title, I may have made a mistake with the size, or it may be dynamic based on content to fit a line

david-allison · 2026-01-20T10:19:22Z

@Fandroid745 is this pending a review, the title issue still looks to be pending

Fandroid745 · 2026-01-20T14:47:26Z

I checked the title height using layout inspector it says 65 dp after removing the bottom constraint from the dialog view

the original has a title height of 26 dp,

I am unclear about what to change to match the original

david-allison · 2026-01-20T16:05:36Z

Check what happened before/after this commit (b0e6996). That will clarify:

Was the original size a bug
Is the text auto-sized, in which case this PR is incorrect

It would also be useful to check with the material dialog specs: https://m3.material.io/components/dialogs/specs

Fandroid745 · 2026-01-21T14:43:05Z

Check what happened before/after this commit (b0e6996). That will clarify:

Was the original size a bug

Is the text auto-sized, in which case this PR is incorrect

It would also be useful to check with the material dialog specs: https://m3.material.io/components/dialogs/specs

I checked the previous commit d33b340 and it uses onMeasure which results in the text being autosized and it allows up to two lines. The 26dp is not a bug as it is the height of the title for single line and the height of the top panel is 60dp.

david-allison · 2026-01-22T15:52:04Z

But the behaviour appears incorrect now we're extending it with this new dialog?

Let's reuse the material dialog logic to provide a standardized experience between the two title bars?

Fandroid745 · 2026-01-23T08:23:03Z

But the behaviour appears incorrect now we're extending it with this new dialog?

Let's reuse the material dialog logic to provide a standardized experience between the two title bars?

Yes, I will update the implementation to reuse the material dialog logic.

Fandroid745 · 2026-01-23T16:11:08Z

I have updated the implementation to use linear layout and reuse material 3 logic.
The dialog title now matches the original dialog in title height.

david-allison · 2026-01-23T16:43:19Z

Hey... it's nearly been a week. I need to ask: what's going on here. This is starting to feel LLM generated.

If I check out 37f12c5, I see:

on b0e6996

on f644067 (this PR)

github-actions bot added the Needs Review label Jan 18, 2026

david-allison requested changes Jan 18, 2026

View reviewed changes

david-allison added the Needs Author Reply Waiting for a reply from the original author label Jan 18, 2026

Fandroid745 force-pushed the feat/help-icon-sync branch 2 times, most recently from 8908f5a to 0c3c88c Compare January 18, 2026 15:40

david-allison requested changes Jan 19, 2026

View reviewed changes

Fandroid745 force-pushed the feat/help-icon-sync branch from 0c3c88c to 65a3f53 Compare January 19, 2026 14:06

Fandroid745 force-pushed the feat/help-icon-sync branch 2 times, most recently from b52744c to 6aa12b6 Compare January 19, 2026 14:39

Fandroid745 force-pushed the feat/help-icon-sync branch from 6aa12b6 to 0c8c74e Compare January 20, 2026 01:53

Fandroid745 force-pushed the feat/help-icon-sync branch from 0c8c74e to bf6bfa3 Compare January 20, 2026 11:53

Fandroid745 force-pushed the feat/help-icon-sync branch from bf6bfa3 to f644067 Compare January 23, 2026 15:27

This comment was marked as outdated.

Sign in to view

Fandroid745 closed this Jan 24, 2026

Fandroid745 reopened this Jan 31, 2026

feat:Add help icon to sync dialog

330ec52

Fandroid745 force-pushed the feat/help-icon-sync branch from f644067 to 330ec52 Compare February 7, 2026 03:54

Uh oh!

Conversation

Fandroid745 commented Jan 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose / Description

Fixes

Approach

How Has This Been Tested?

Checklist

Uh oh!

david-allison left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

david-allison Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Fandroid745 Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

david-allison Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

david-allison Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

david-allison left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

david-allison Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Fandroid745 commented Jan 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

david-allison commented Jan 19, 2026

Uh oh!

david-allison commented Jan 20, 2026

Uh oh!

Fandroid745 commented Jan 20, 2026

Uh oh!

david-allison commented Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Fandroid745 commented Jan 21, 2026

Uh oh!

david-allison commented Jan 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Fandroid745 commented Jan 23, 2026

Uh oh!

Fandroid745 commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

david-allison commented Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as outdated.

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Fandroid745 commented Jan 18, 2026 •

edited

Loading

david-allison left a comment •

edited

Loading

Fandroid745 commented Jan 19, 2026 •

edited

Loading

david-allison commented Jan 20, 2026 •

edited

Loading

david-allison commented Jan 22, 2026 •

edited

Loading

Fandroid745 commented Jan 23, 2026 •

edited

Loading

david-allison commented Jan 23, 2026 •

edited

Loading