Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,17 @@ package com.ichi2.anki.dialogs

import android.app.Dialog
import android.os.Bundle
import android.view.View
import android.view.ViewGroup
import android.widget.ImageButton
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import androidx.core.os.bundleOf
import androidx.recyclerview.widget.RecyclerView
import com.ichi2.anki.CardBrowser
import com.ichi2.anki.R
import com.ichi2.anki.analytics.AnalyticsDialogFragment
import com.ichi2.anki.databinding.CardBrowserItemMySearchesDialogBinding
import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment.Companion.ARG_SAVED_SEARCH
import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment.Companion.TYPE_SEARCH_REMOVED
import com.ichi2.anki.dialogs.SavedBrowserSearchesDialogFragment.Companion.TYPE_SEARCH_SELECTED
import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
import com.ichi2.utils.customListAdapter
import com.ichi2.utils.message
Expand Down Expand Up @@ -105,31 +106,27 @@ class SavedBrowserSearchesDialogFragment : AnalyticsDialogFragment() {
parent: ViewGroup,
viewType: Int,
): SavedSearchesViewHolder {
val rowView = layoutInflater.inflate(R.layout.card_browser_item_my_searches_dialog, parent, false)
return SavedSearchesViewHolder(rowView)
val binding = CardBrowserItemMySearchesDialogBinding.inflate(layoutInflater, parent, false)
return SavedSearchesViewHolder(binding)
}

override fun onBindViewHolder(
holder: SavedSearchesViewHolder,
position: Int,
) {
val entry = entries[position]
holder.name.text = entry.first
holder.query.text = entry.second
holder.binding.searchName.text = entry.first
holder.binding.searchQuery.text = entry.second
holder.itemView.setOnClickListener { onSelection(entry.first) }
holder.deleteBtn.setOnClickListener { onRemoval(entry.first) }
holder.binding.deleteSearchButton.setOnClickListener { onRemoval(entry.first) }
}

override fun getItemCount(): Int = entries.size
}

private class SavedSearchesViewHolder(
rowView: View,
) : RecyclerView.ViewHolder(rowView) {
val name: TextView = rowView.findViewById(R.id.card_browser_my_search_name_textview)
val query: TextView = rowView.findViewById(R.id.card_browser_my_search_query_textview)
val deleteBtn: ImageButton = rowView.findViewById(R.id.card_browser_my_search_remove_button)
}
val binding: CardBrowserItemMySearchesDialogBinding,
) : RecyclerView.ViewHolder(binding.root)

companion object {
const val REQUEST_SAVED_SEARCH_ACTION = "request_saved_search_action"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
>

<ImageButton
android:id="@+id/card_browser_my_search_remove_button"
android:id="@+id/delete_search_button"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentEnd="true"
Expand All @@ -22,21 +22,21 @@
app:layout_constraintTop_toTopOf="parent" />

<com.ichi2.ui.FixedTextView
android:id="@+id/card_browser_my_search_name_textview"
android:id="@+id/search_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="8dp"
android:textAppearance="?textAppearanceListItem"
app:layout_constraintBottom_toTopOf="@id/card_browser_my_search_query_textview"
app:layout_constraintEnd_toStartOf="@+id/card_browser_my_search_remove_button"
app:layout_constraintBottom_toTopOf="@id/search_query"
app:layout_constraintEnd_toStartOf="@id/delete_search_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Custom saved search"
/>

<com.ichi2.ui.FixedTextView
android:id="@+id/card_browser_my_search_query_textview"
android:id="@+id/search_query"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
Expand All @@ -46,9 +46,9 @@
android:ellipsize="end"
android:textAppearance="?textAppearanceListItemSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/card_browser_my_search_remove_button"
app:layout_constraintEnd_toStartOf="@id/delete_search_button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/card_browser_my_search_name_textview"
app:layout_constraintTop_toBottomOf="@id/search_name"
tools:text="flag:5"
/>

Expand Down