feat(card-browser): show 'preview' before 'add' in new UI

'add' only appears if there are 0 cards selected
 so preview is hidden

From a review comment on 20454

Author: david-allison

AnkiDroid/src/main/java/com/ichi2/anki/browser/CardBrowserFragment.kt

@@ -762,8 +762,16 @@ class CardBrowserFragment :
             viewLifecycleOwner,
         )
 
+        // searchview specific logic
         menuHost.addPrepareMenuProvider { menu ->
             if (!useSearchView) return@addPrepareMenuProvider
+
+            // reorder 'preview' to appear before 'add'
+            val preview = menu.findItem(R.id.action_preview_many)
+            if (activityViewModel.cards.size > 0) {
+                preview?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+            }
+
             menu.findItem(R.id.action_search)?.isVisible = false
             menu.findItem(R.id.action_list_my_searches)?.isVisible = false
             menu.findItem(R.id.action_save_search)?.isVisible = false

AnkiDroid/src/main/res/drawable/ic_remove_red_eye_white.xml

@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>

AnkiDroid/src/main/res/menu/card_browser.xml

@@ -53,6 +53,7 @@
 
     <item
         android:id="@+id/action_preview_many"
+        android:icon="@drawable/ic_remove_red_eye_white"
         android:title="@string/card_editor_preview_card"/>
 
     <item

AnkiDroid/src/test/java/com/ichi2/anki/CardBrowserTest.kt

@@ -1769,7 +1769,6 @@ class CardBrowserTest : RobolectricTest() {
     }
 
     @Test
-    @Ignore("pending PR 20454")
     fun `options menu - new ui - no notes`() =
         withOptionsMenu(
             OptionsMenuType(
@@ -1802,7 +1801,6 @@ class CardBrowserTest : RobolectricTest() {
         }
 
     @Test
-    @Ignore("pending PR 20454")
     fun `options menu - new ui - add is first if no results`() =
         withOptionsMenu(
             OptionsMenuType(

AnkiDroid/src/test/java/com/ichi2/anki/RobolectricTest.kt

@@ -22,6 +22,7 @@ import android.app.Application
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.res.Resources
 import android.os.Looper
 import android.widget.TextView
 import androidx.annotation.CallSuper
@@ -300,6 +301,8 @@ open class RobolectricTest :
     val targetContext: Context
         get() = ApplicationProvider.getApplicationContext()
 
+    val resources: Resources get() = targetContext.resources
+
     /**
      * Returns an instance of [SharedPreferences] using the test context
      * @see [editPreferences] for editing