feat:Add help icon to sync dialog

Author: Fandroid745

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

@@ -38,6 +38,7 @@ import com.ichi2.anki.dialogs.SyncErrorDialog.Type.DIALOG_SYNC_SANITY_ERROR_CONF
 import com.ichi2.anki.dialogs.SyncErrorDialog.Type.DIALOG_USER_NOT_LOGGED_IN_SYNC
 import com.ichi2.anki.utils.ext.dismissAllDialogFragments
 import com.ichi2.anki.utils.openUrl
+import com.ichi2.utils.titleWithHelpIcon
 
 class SyncErrorDialog : AsyncDialogFragment() {
     interface SyncErrorDialogListener {
@@ -93,11 +94,20 @@ class SyncErrorDialog : AsyncDialogFragment() {
             DIALOG_SYNC_CONFLICT_RESOLUTION -> {
                 // Sync conflict; allow user to cancel, or choose between local and remote versions
                 dialog
-                    .setIcon(R.drawable.ic_sync_problem)
+                    .titleWithHelpIcon(
+                        text = getString(R.string.sync_conflict_title_new),
+                        icon = R.drawable.ic_sync_problem,
+                    ) {
+                        requireContext().openUrl(getString(R.string.link_sync_conflict_help))
+                    }.setMessage(R.string.sync_conflict_message_new)
                     .setPositiveButton(R.string.sync_conflict_keep_local_new) { _, _ ->
-                        requireSyncErrorDialogListener().showSyncErrorDialog(DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_LOCAL)
+                        requireSyncErrorDialogListener().showSyncErrorDialog(
+                            DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_LOCAL,
+                        )
                     }.setNegativeButton(R.string.sync_conflict_keep_remote_new) { _, _ ->
-                        requireSyncErrorDialogListener().showSyncErrorDialog(DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_REMOTE)
+                        requireSyncErrorDialogListener().showSyncErrorDialog(
+                            DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_REMOTE,
+                        )
                     }.setNeutralButton(R.string.dialog_cancel) { _, _ ->
                         activity?.dismissAllDialogFragments()
                     }.create()

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

@@ -429,18 +429,27 @@ fun AlertDialog.Builder.listItemsAndMessage(
  * }
  * ```
  *
- * @param block action executed when the help icon is clicked
+ * @param onHelpClick action executed when the help icon is clicked
  *
  */
 fun AlertDialog.Builder.titleWithHelpIcon(
     @StringRes stringRes: Int? = null,
     text: String? = null,
-    block: View.OnClickListener,
-) {
+    @DrawableRes icon: Int? = null,
+    onHelpClick: View.OnClickListener,
+): AlertDialog.Builder {
     // setup the view for the dialog
     val customTitleView = LayoutInflater.from(context).inflate(R.layout.alert_dialog_title_with_help, null, false)
     setCustomTitle(customTitleView)
 
+    val titleIconView = customTitleView.findViewById<ImageView>(R.id.title_icon)
+    if (icon != null) {
+        titleIconView.setImageResource(icon)
+        titleIconView.visibility = View.VISIBLE
+    } else {
+        titleIconView.visibility = View.GONE
+    }
+
     // apply a custom title
     val titleTextView = customTitleView.findViewById<TextView>(android.R.id.title)
 
@@ -453,8 +462,9 @@ fun AlertDialog.Builder.titleWithHelpIcon(
     // set the action when clicking the help icon
     customTitleView.findViewById<ImageView>(R.id.help_icon).setOnClickListener { v ->
         Timber.i("dialog help icon click")
-        block.onClick(v)
+        onHelpClick.onClick(v)
     }
+    return this
 }
 
 /** Calls [AlertDialog.dismiss], ignoring errors */

AnkiDroid/src/main/res/layout/alert_dialog_title_with_help.xml

@@ -5,33 +5,49 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     style="?attr/materialAlertDialogTitlePanelStyle"
-    android:orientation="horizontal"
     android:paddingStart="24dp"
     android:paddingEnd="8dp"
     android:paddingTop="24dp"
     android:paddingBottom="8dp">
 
+    <ImageView
+        android:id="@+id/title_icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@android:id/title"
+        app:layout_constraintBottom_toBottomOf="@android:id/title"
+        app:tint="?attr/colorOnSurface"
+        tools:visibility="visible"
+        tools:src="@drawable/ic_sync_problem" />
+
     <androidx.appcompat.widget.DialogTitleView
         android:id="@android:id/title"
         android:layout_width="0dp"
         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_toStartOf="parent"
-        tools:text="Reset Card Progress" />
+        app:layout_constraintStart_toEndOf="@+id/title_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="Sync Conflict" />
 
     <ImageView
         android:id="@+id/help_icon"
         style="?attr/materialAlertDialogTitleIconStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:background="?attr/selectableItemBackground"
+        android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="8dp"
         android:src="@drawable/ic_help_black_24dp"
         android:contentDescription="@string/help"
+        app:tint="?attr/colorOnSurface"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="@android:id/title"
-        app:layout_constraintTop_toTopOf="@android:id/title" />
+        app:layout_constraintTop_toTopOf="@android:id/title"
+        app:layout_constraintBottom_toBottomOf="@android:id/title" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -116,6 +116,7 @@
     <string name="link_manual_ar">https://docs.ankidroid.org/manual-ar.html</string>
     <string name="link_manual_note_format_toolbar">https://docs.ankidroid.org/manual.html#noteFormattingToolbar</string>
     <string name="link_manual_browser_find_replace">https://docs.ankiweb.net/browsing.html#find-and-replace</string>
+    <string name="link_sync_conflict_help">https://docs.ankiweb.net/syncing.html#conflicts</string>
     <string name="link_user_actions_help">https://docs.ankidroid.org/#userActions</string>
     <string name="link_faq_tts">https://github.com/ankidroid/Anki-Android/wiki/FAQ#tts--text-to-speech-is-not-speaking</string>
     <string name="link_faq_missing_media" tools:ignore="Typos">https://github.com/ankidroid/Anki-Android/wiki/FAQ#why-doesnt-my-sound-or-image-work-on-ankidroid</string>
@@ -348,7 +349,8 @@
         <item>android.permission.WRITE_EXTERNAL_STORAGE</item>
     </string-array>
     <string name="post_notification_permission">android.permission.POST_NOTIFICATIONS</string>
-    <string name="record_audio_permission">android.permission.RECORD_AUDIO</string>
+    <string name="record_audio_permission">android
+        .permission.RECORD_AUDIO</string>
 
 
     <string-array name="import_cache_error_resolutions">