From ba404c04d359909b36e9dda5831bfe5c4e0388a2 Mon Sep 17 00:00:00 2001 From: Michatec Date: Wed, 5 Aug 2026 19:02:53 +0200 Subject: [PATCH] feat(collection): add search and favorite filtering Implemented a search bar and favorites filter for the station list. Added a search button to the station collection card, updated the adapter to handle filtered datasets, and integrated the search UI into both mobile and Android TV layouts. Includes localized strings for multiple languages. --- .../java/com/michatec/radio/PlayerFragment.kt | 47 ++++++++++- .../radio/collection/CollectionAdapter.kt | 69 ++++++++++++---- .../com/michatec/radio/ui/LayoutHolder.kt | 30 +++++++ app/src/main/res/drawable/ic_search_24dp.xml | 9 +++ .../res/layout-television/fragment_player.xml | 50 +++++++++++- .../main/res/layout/card_add_new_station.xml | 18 +++++ app/src/main/res/layout/fragment_player.xml | 80 ++++++++++++++++--- app/src/main/res/values-da/strings.xml | 4 + app/src/main/res/values-de/strings.xml | 4 + app/src/main/res/values-el/strings.xml | 5 ++ app/src/main/res/values-fr/strings.xml | 5 ++ app/src/main/res/values-ja/strings.xml | 4 + app/src/main/res/values-nl/strings.xml | 4 + app/src/main/res/values-pl/strings.xml | 4 + app/src/main/res/values-ru/strings.xml | 4 + app/src/main/res/values-uk/strings.xml | 4 + app/src/main/res/values/strings.xml | 4 + 17 files changed, 318 insertions(+), 27 deletions(-) create mode 100644 app/src/main/res/drawable/ic_search_24dp.xml diff --git a/app/src/main/java/com/michatec/radio/PlayerFragment.kt b/app/src/main/java/com/michatec/radio/PlayerFragment.kt index 12ff130..fe401a0 100644 --- a/app/src/main/java/com/michatec/radio/PlayerFragment.kt +++ b/app/src/main/java/com/michatec/radio/PlayerFragment.kt @@ -10,10 +10,13 @@ import android.content.pm.PackageManager import android.media.AudioManager import android.net.Uri import android.os.* +import android.text.Editable +import android.text.TextWatcher import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.view.inputmethod.InputMethodManager import android.widget.Toast import androidx.activity.OnBackPressedCallback import androidx.activity.result.ActivityResultLauncher @@ -97,6 +100,7 @@ class PlayerFragment : Fragment(), private var tempStationUuid: String = String() private var itemTouchHelper: ItemTouchHelper? = null private var shaderEffectView: ShaderEffectView? = null + private var isSearchActive: Boolean = false // Check if the device running the app is an Android TV instance private val isAndroidTV: Boolean by lazy { @@ -181,6 +185,7 @@ class PlayerFragment : Fragment(), // find views and set them up val rootView: View = inflater.inflate(R.layout.fragment_player, container, false) layout = LayoutHolder(rootView) + isSearchActive = false shaderEffectView = rootView.findViewById(R.id.player_shader_effect) initializeViews() @@ -381,6 +386,20 @@ class PlayerFragment : Fragment(), pickImage() } + /* Overrides onSearchButtonTapped from CollectionAdapterListener */ + override fun onSearchButtonTapped() { + isSearchActive = !isSearchActive + layout.toggleSearchLayout(isSearchActive) + if (!isSearchActive) { + collectionAdapter.filter("", false) + } else if (isAndroidTV) { + // TV: focus search field and show keyboard + layout.searchInputEditText?.requestFocus() + val imm = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager + imm?.showSoftInput(layout.searchInputEditText, 0) + } + } + /* Overrides onYesNoDialog from YesNoDialogListener */ override fun onYesNoDialog( @@ -518,7 +537,7 @@ class PlayerFragment : Fragment(), Snackbar.LENGTH_SHORT ) if (!isAndroidTV) { - snackbar.setAnchorView(layout.bottomSheet) + snackbar.anchorView = layout.bottomSheet } snackbar.show() } @@ -532,6 +551,20 @@ class PlayerFragment : Fragment(), togglePeriodicSleepTimerUpdateRequest() } + // set up search input + layout.searchInputEditText?.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {} + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {} + override fun afterTextChanged(s: Editable?) { + performSearch() + } + }) + + // set up favorites filter + layout.searchFilterFavoritesSwitch?.setOnCheckedChangeListener { _, _ -> + performSearch() + } + // set up TV station navigation layout.playerPrevButtonView?.setOnClickListener { val currentPosition = CollectionHelper.getStationPosition(collection, playerState.stationUuid) @@ -607,6 +640,14 @@ class PlayerFragment : Fragment(), pickSingleMediaLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)) } + /* Performs search and updates list */ + private fun performSearch() { + val query = layout.searchInputEditText?.text?.toString() ?: "" + val onlyFavorites = layout.searchFilterFavoritesSwitch?.isChecked ?: false + collectionAdapter.filter(query, onlyFavorites) + layout.toggleSearchNoResults(collectionAdapter.itemCount == 1 && (query.isNotEmpty() || onlyFavorites)) + } + /* Handles this activity's start intent */ private fun handleStartIntent() { val intent = (activity as Activity).intent @@ -724,9 +765,9 @@ class PlayerFragment : Fragment(), // handle navigation arguments handleNavigationArguments() } - collectionViewModel.collectionSizeLiveData.observe(this) { + collectionViewModel.collectionSizeLiveData.observe(this) { size -> // size of collection changed - layout.toggleOnboarding(activity as Context, collection.stations.size) + layout.toggleOnboarding(activity as Context, size) updatePlayerViews() CollectionHelper.exportCollectionM3u(activity as Context, collection) CollectionHelper.exportCollectionPls(activity as Context, collection) diff --git a/app/src/main/java/com/michatec/radio/collection/CollectionAdapter.kt b/app/src/main/java/com/michatec/radio/collection/CollectionAdapter.kt index 5d4cb49..fee7b26 100644 --- a/app/src/main/java/com/michatec/radio/collection/CollectionAdapter.kt +++ b/app/src/main/java/com/michatec/radio/collection/CollectionAdapter.kt @@ -50,12 +50,15 @@ class CollectionAdapter( /* Main class variables */ private lateinit var collectionViewModel: CollectionViewModel private var collection: Collection = Collection() + private var filteredStations: MutableList = mutableListOf() private var editStationsEnabled: Boolean = PreferencesHelper.loadEditStationsEnabled(context) private var editStationStreamsEnabled: Boolean = PreferencesHelper.loadEditStreamUrisEnabled(context) private var expandedStationUuid: String = PreferencesHelper.loadStationListStreamUuid() private var expandedStationPosition: Int = -1 var isExpandedForEdit: Boolean = false private var reorderStationUuid: String = "" + private var currentSearchQuery: String = "" + private var currentOnlyFavorites: Boolean = false /* Listener Interface */ @@ -63,6 +66,7 @@ class CollectionAdapter( fun onPlayButtonTapped(stationUuid: String) fun onAddNewButtonTapped() fun onChangeImageButtonTapped(stationUuid: String) + fun onSearchButtonTapped() } @@ -108,8 +112,7 @@ class CollectionAdapter( /* Implement the method to handle item move */ fun onItemMove(fromPosition: Int, toPosition: Int) { - // Do nothing if in "edit" mode - if (isExpandedForEdit) { + if (isExpandedForEdit || filteredStations.size != collection.stations.size) { return } @@ -141,8 +144,12 @@ class CollectionAdapter( /* Implement the method to handle item dismissal */ fun onItemDismiss(position: Int) { - // Remove the item at the given position from your data collection - collection.stations.removeAt(position) + val station = filteredStations[position] + val originalPosition = collection.stations.indexOfFirst { it.uuid == station.uuid } + if (originalPosition != -1) { + collection.stations.removeAt(originalPosition) + } + filteredStations.removeAt(position) notifyItemRemoved(position) } @@ -154,6 +161,27 @@ class CollectionAdapter( } + /* Filters the station list based on query and favorite status */ + fun filter(query: String, onlyFavorites: Boolean) { + currentSearchQuery = query + currentOnlyFavorites = onlyFavorites + applyFilter() + } + + @SuppressLint("NotifyDataSetChanged") + private fun applyFilter() { + filteredStations = if (currentSearchQuery.isEmpty() && !currentOnlyFavorites) { + collection.stations.toMutableList() + } else { + collection.stations.filter { station -> + val matchesQuery = station.name.contains(currentSearchQuery, ignoreCase = true) + val matchesFavorite = !currentOnlyFavorites || station.starred + matchesQuery && matchesFavorite + }.toMutableList() + } + notifyDataSetChanged() + } + /* Overrides onBindViewHolder */ override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { when (holder) { @@ -171,11 +199,15 @@ class CollectionAdapter( addNewViewHolder.visualizerButtonView.setOnClickListener { it.findNavController().navigate(R.id.visualizer_destination) } + addNewViewHolder.playerSearchButtonView.setOnClickListener { + collectionAdapterListener.onSearchButtonTapped() + } + addNewViewHolder.playerSearchButtonView.isVisible = collection.stations.isNotEmpty() } // CASE STATION CARD is StationViewHolder -> { // get station from position - val station: Station = collection.stations[position] + val station: Station = filteredStations[position] // get reference to StationViewHolder val stationViewHolder: StationViewHolder = holder @@ -583,7 +615,7 @@ class CollectionAdapter( } else if (holder is StationViewHolder) { // get station from position - val station: Station = collection.stations[holder.bindingAdapterPosition] + val station: Station = filteredStations[holder.bindingAdapterPosition] for (data in payloads) { when (data as Int) { @@ -621,19 +653,24 @@ class CollectionAdapter( /* Overrides getItemCount */ override fun getItemCount(): Int { // +1 ==> the add station card - return collection.stations.size + 1 + return filteredStations.size + 1 } /* Removes a station from collection */ fun removeStation(context: Context, position: Int) { + val station = filteredStations[position] + val originalPosition = collection.stations.indexOfFirst { it.uuid == station.uuid } + if (originalPosition == -1) return + val newCollection = collection.deepCopy() // delete images assets - CollectionHelper.deleteStationImages(context, newCollection.stations[position]) + CollectionHelper.deleteStationImages(context, newCollection.stations[originalPosition]) // remove station from collection - newCollection.stations.removeAt(position) + newCollection.stations.removeAt(originalPosition) collection = newCollection // update list + filteredStations.removeAt(position) notifyItemRemoved(position) // save collection and broadcast changes CollectionHelper.saveCollection(context, newCollection) @@ -642,15 +679,16 @@ class CollectionAdapter( /* Toggles starred status of a station */ fun toggleStarredStation(context: Context, position: Int) { + val station = filteredStations[position] + val originalPosition = collection.stations.indexOfFirst { it.uuid == station.uuid } + if (originalPosition == -1) return + // update view (reset "swipe" state of station card) notifyItemChanged(position) // mark starred - val stationUuid: String = collection.stations[position].uuid - collection.stations[position].apply { starred = !starred } + collection.stations[originalPosition].apply { starred = !starred } // sort collection collection = CollectionHelper.sortCollection(collection) - // update list - notifyItemMoved(position, CollectionHelper.getStationPosition(collection, stationUuid)) // save collection and broadcast changes CollectionHelper.saveCollection(context, collection) } @@ -690,7 +728,7 @@ class CollectionAdapter( /* Determines if position is last */ private fun isPositionFooter(position: Int): Boolean { - return position == collection.stations.size + return position == filteredStations.size } @@ -698,6 +736,7 @@ class CollectionAdapter( @SuppressLint("NotifyDataSetChanged") private fun updateRecyclerView(oldCollection: Collection, newCollection: Collection) { collection = newCollection + applyFilter() if (oldCollection.stations.isEmpty() && newCollection.stations.isNotEmpty()) { // data set has been initialized - redraw the whole list notifyDataSetChanged() @@ -757,6 +796,8 @@ class CollectionAdapter( listItemAddNewLayout.findViewById(R.id.card_settings) val visualizerButtonView: ExtendedFloatingActionButton = listItemAddNewLayout.findViewById(R.id.card_visualizer) + val playerSearchButtonView: ExtendedFloatingActionButton = + listItemAddNewLayout.findViewById(R.id.player_search_button) } /* * End of inner class diff --git a/app/src/main/java/com/michatec/radio/ui/LayoutHolder.kt b/app/src/main/java/com/michatec/radio/ui/LayoutHolder.kt index 89d001a..0f37cfd 100644 --- a/app/src/main/java/com/michatec/radio/ui/LayoutHolder.kt +++ b/app/src/main/java/com/michatec/radio/ui/LayoutHolder.kt @@ -6,7 +6,10 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.graphics.drawable.AnimatedVectorDrawable +import android.transition.ChangeBounds +import android.transition.TransitionManager import android.view.View +import android.view.ViewGroup import android.view.animation.Animation import android.view.animation.AnimationUtils import android.widget.ImageButton @@ -23,7 +26,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.google.android.gms.cast.framework.CastButtonFactory import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.materialswitch.MaterialSwitch import com.google.android.material.snackbar.Snackbar +import com.google.android.material.textfield.TextInputEditText import com.michatec.radio.Keys import com.michatec.radio.R import com.michatec.radio.core.Station @@ -56,6 +61,10 @@ data class LayoutHolder(var rootView: View) { var playerPrevButtonView: ImageButton? = rootView.findViewById(R.id.player_prev_button) var playerNextButtonView: ImageButton? = rootView.findViewById(R.id.player_next_button) private var bufferingIndicator: ProgressBar = rootView.findViewById(R.id.player_buffering_indicator) + private var searchLayout: View? = rootView.findViewById(R.id.search_layout) + var searchInputEditText: TextInputEditText? = rootView.findViewById(R.id.search_input_edit_text) + var searchFilterFavoritesSwitch: MaterialSwitch? = rootView.findViewById(R.id.search_filter_favorites_switch) + private var searchNoResultsView: View? = rootView.findViewById(R.id.search_no_results_view) private var sheetStreamingLinkHeadline: TextView? = rootView.findViewById(R.id.sheet_streaming_link_headline) private var sheetStreamingLinkView: TextView? = rootView.findViewById(R.id.sheet_streaming_link) private var sheetMetadataHistoryHeadline: TextView? = rootView.findViewById(R.id.sheet_metadata_headline) @@ -362,6 +371,27 @@ data class LayoutHolder(var rootView: View) { } } + /* Toggles visibility of the search layout */ + fun toggleSearchLayout(visible: Boolean) { + val parent = searchLayout?.parent as? ViewGroup + if (parent != null) { + val transition = ChangeBounds() + transition.duration = 300 + TransitionManager.beginDelayedTransition(parent, transition) + } + searchLayout?.isVisible = visible + if (!visible) { + searchInputEditText?.text?.clear() + searchFilterFavoritesSwitch?.isChecked = false + searchNoResultsView?.isGone = true + } + } + + /* Shows/hides no results message */ + fun toggleSearchNoResults(show: Boolean) { + searchNoResultsView?.isVisible = show + } + /* Toggles visibility of the onboarding screen */ fun toggleOnboarding(context: Context, collectionSize: Int): Boolean { diff --git a/app/src/main/res/drawable/ic_search_24dp.xml b/app/src/main/res/drawable/ic_search_24dp.xml new file mode 100644 index 0000000..ab3ba3f --- /dev/null +++ b/app/src/main/res/drawable/ic_search_24dp.xml @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout-television/fragment_player.xml b/app/src/main/res/layout-television/fragment_player.xml index a017772..0a2bb33 100644 --- a/app/src/main/res/layout-television/fragment_player.xml +++ b/app/src/main/res/layout-television/fragment_player.xml @@ -12,6 +12,54 @@ android:layout_height="match_parent" android:layout_weight="1"> + + + + + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/search_layout" /> + + - - + android:orientation="vertical"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d59605f..a2d3b83 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -191,4 +191,8 @@ Betjen radioen fra din webbrowser Betjen radioen fra http://%1$s:8080 Web fjernbetjeningsserver crashet/stoppede. + Søg stationer… + Kun favoritter + Ingen stationer fundet. + Søg stationer diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9b79a9e..9022005 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -15,6 +15,7 @@ Schlaf-Timer starten Start/Pause Senderbild + Sender suchen Station hinzufügen Sendername @@ -193,4 +194,7 @@ Steuere das Radio über deinen Webbrowser Steuere das Radio über http://%1$s:8080 Web-Fernbedienungsserver abgestürzt/gestoppt. + Sender suchen… + Nur Favoriten + Keine Sender gefunden. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 2c63348..9e620b1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -193,4 +193,9 @@ Ελέγξτε το ραδιόφωνο από το πρόγραμμα περιήγησής σας Ελέγξτε το ραδιόφωνο από το http://%1$s:8080 Ο διακομιστής τηλεχειριστηρίου ιστού κατέρρευσε/σταμάτησε. + + Αναζήτηση σταθμών + Αναζήτηση σταθμών… + Μόνο αγαπημένα + Δεν βρέθηκαν σταθμοί. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e633859..fc44dd5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -191,4 +191,9 @@ Contrôlez la radio depuis votre navigateur web Contrôlez la radio depuis http://%1$s:8080 Serveur de télécommande Web planté/arrêté. + + Rechercher des stations + Rechercher des stations… + Favoris uniquement + Aucune station trouvée. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9781420..ce5a2bb 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -192,4 +192,8 @@ ウェブブラウザからラジオを操作 http://%1$s:8080 からラジオを操作 Webリモートサーバーがクラッシュ/停止しました。 + 局を検索… + お気に入りのみ + 局が見つかりません。 + 局を検索 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d925932..d454c4a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -193,4 +193,8 @@ Bedien de radio vanuit je webbrowser Bedien de radio via http://%1$s:8080 De webserver voor de afstandsbediening is gecrasht of gestopt. + Zenders zoeken… + Alleen favorieten + Geen zenders gevonden. + Zenders zoeken diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2967024..29f9f7a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -192,4 +192,8 @@ Steruj radiem z przeglądarki internetowej Steruj radiem przez http://%1$s:8080 Serwer zdalnego sterowania uległ awarii/zatrzymaniu. + Szukaj stacji… + Tylko ulubione + Nie znaleziono stacji. + Szukaj stacji diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e69a691..84971d1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -193,4 +193,8 @@ Управляйте радио из вашего веб-браузера Управляйте радио через http://%1$s:8080 Веб-сервер удалённого управления упал/остановлен. + Поиск станций… + Только избранное + Станции не найдены. + Поиск станций diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4f52ee6..7cb400c 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -193,4 +193,8 @@ Керуйте радіо з вашого веб-браузера Керуйте радіо через http://%1$s:8080 Веб-сервер дистанційного керування аварійно зупинився/зупинено. + Пошук станцій… + Тільки улюблені + Станцій не знайдено. + Пошук станцій diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e980e5e..aff2601 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,6 +18,7 @@ Start sleep timer Play/pause Station image + Search stations Add Station @@ -228,4 +229,7 @@ Control radio from your web browser Control radio from http://%1$s:8080 Web Remote server crashed / stopped. + Search stations… + Only favorites + No stations found.