Skip to content

Commit 266914c

Browse files
committed
feat(card-browser): add icons for non-multiselect options
1 parent 8bd5876 commit 266914c

3 files changed

Lines changed: 11 additions & 1 deletion

File tree

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import android.widget.TextView
3838
import androidx.annotation.CheckResult
3939
import androidx.annotation.LayoutRes
4040
import androidx.annotation.VisibleForTesting
41+
import androidx.appcompat.view.menu.MenuBuilder
4142
import androidx.appcompat.widget.ThemeUtils
4243
import androidx.core.content.ContextCompat
4344
import androidx.core.graphics.drawable.DrawableCompat
@@ -762,6 +763,11 @@ class CardBrowserFragment :
762763
menuHost.addPrepareMenuProvider { menu ->
763764
if (!useSearchView) return@addPrepareMenuProvider
764765

766+
// icons have been added for all 'unselected' items
767+
if (!activityViewModel.isInMultiSelectMode) {
768+
(menu as? MenuBuilder)?.setOptionalIconsVisible(true)
769+
}
770+
765771
// reorder 'preview' to appear before 'add'
766772
val preview = menu.findItem(R.id.action_preview_many)
767773
if (activityViewModel.cards.size > 0) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
android:width="24dp"
33
android:height="24dp"
44
android:viewportWidth="24"
5-
android:viewportHeight="24">
5+
android:viewportHeight="24"
6+
android:tint="?attr/colorControlNormal">
67
<path
78
android:pathData="M3.1992,3.9688C2.0992,3.9688 1.1992,4.8688 1.1992,5.9688L1.1992,13.9688C1.1992,15.0688 2.0992,15.9688 3.1992,15.9688L17.1992,15.9688C18.2992,15.9688 19.1992,15.0688 19.1992,13.9688L19.1992,5.9688C19.1992,4.8688 18.2992,3.9688 17.1992,3.9688L3.1992,3.9688zM5.9395,6.0488L7.9395,6.0488zM21.1992,6.9688L21.1992,17.9688L4.1992,17.9688L4.1992,17.9844A1.9846,1.9846 0,0 0,6.1836 19.9688L21.1992,19.9688C22.2992,19.9688 23.1992,19.0688 23.1992,17.9688L23.1992,8.9531A1.9846,1.9846 0,0 0,21.2148 6.9688L21.1992,6.9688z M3,6H12V8H3 M4,9H11V11H4 M5,12H10V14H5"
89
android:fillColor="#ffffff"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,18 @@
5858

5959
<item
6060
android:id="@+id/action_select_all"
61+
android:icon="@drawable/ic_select_all_white"
6162
android:title="@string/card_browser_select_all"/>
6263

6364
<item
6465
android:id="@+id/action_open_options"
66+
android:icon="@drawable/ic_settings_black"
6567
android:title="@string/study_options"
6668
ankidroid:showAsAction="never"/>
6769

6870
<item
6971
android:id="@+id/action_create_filtered_deck"
72+
android:icon="@drawable/ic_add_filtered_deck"
7073
ankidroid:showAsAction="never"
7174
tools:title="Create filtered deck..."
7275
/>

0 commit comments

Comments
 (0)