Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ open class CardBrowser :
startLoadingCollection()

setupFlows()
setupNewSearchView()
registerOnForgetHandler { viewModel.queryAllSelectedCardIds() }
registerSaveSearchHandler()

Expand Down Expand Up @@ -401,6 +402,11 @@ open class CardBrowser :
}
}

private fun setupNewSearchView() {
if (!useSearchView) return
supportActionBar?.hide()
}

override fun setupBackPressedCallbacks() {
onBackPressedDispatcher.addCallback(this, multiSelectOnBackPressedCallback)
super.setupBackPressedCallbacks()
Expand Down
91 changes: 50 additions & 41 deletions AnkiDroid/src/main/res/layout/card_browser_searchview_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,6 @@
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior" >

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">


<ImageButton
android:id="@+id/toggle_row_selections"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_select_all_white"
android:background="?attr/selectableItemBackgroundBorderless"
app:tint="?attr/colorControlNormal"
/>


<LinearLayout
android:id="@+id/browser_column_headings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:longClickable="true">
</LinearLayout>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@drawable/browser_heading_bottom_divider"
/>

<com.google.android.material.progressindicator.LinearProgressIndicator
android:id="@+id/browser_progress"
android:layout_width="match_parent"
Expand Down Expand Up @@ -91,24 +60,64 @@
tools:hint="Search cards/notes"
tools:menu="@menu/card_browser" />

<com.google.android.material.chip.ChipGroup

<HorizontalScrollView
android:id="@+id/chip_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="horizontal"
android:layout_marginTop="-8dp"
android:paddingHorizontal="16dp"
app:layout_scrollFlags="scroll|enterAlways">

<com.google.android.material.chip.Chip
android:id="@+id/chip_decks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:chipIcon="@drawable/ic_cards_star"
android:maxLines="1"
android:ellipsize="middle"
<com.google.android.material.chip.ChipGroup
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.chip.Chip
android:id="@+id/chip_decks"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:chipIcon="@drawable/ic_cards_star"
android:maxLines="1"
android:ellipsize="middle"

tools:text="All Decks"
/>
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>

<!-- column headers & select all/none -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_scrollFlags="scroll|enterAlways">


tools:text="All Decks"
<ImageButton
android:id="@+id/toggle_row_selections"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_select_all_white"
android:background="?attr/selectableItemBackgroundBorderless"
app:tint="?attr/colorControlNormal"
/>
</com.google.android.material.chip.ChipGroup>


<LinearLayout
android:id="@+id/browser_column_headings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:longClickable="true">
</LinearLayout>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@drawable/browser_heading_bottom_divider"
/>

</com.google.android.material.appbar.AppBarLayout>

Expand Down
Loading