From 2086a6cac5c70cf6b1cec8d87a22ec8a965c0e37 Mon Sep 17 00:00:00 2001 From: tzugen Date: Tue, 23 Nov 2021 23:54:34 +0100 Subject: [PATCH] Unify play next and play last icons, style fixes --- .../org/moire/ultrasonic/fragment/SearchFragment.kt | 10 +++++++--- .../org/moire/ultrasonic/adapters/BaseAdapter.kt | 2 +- .../moire/ultrasonic/adapters/FolderSelectorBinder.kt | 6 +++--- .../kotlin/org/moire/ultrasonic/adapters/Helper.kt | 4 ++-- .../moire/ultrasonic/fragment/ArtistListFragment.kt | 3 ++- .../org/moire/ultrasonic/model/SearchListModel.kt | 8 -------- .../org/moire/ultrasonic/util/DragSortCallback.kt | 4 +--- .../src/main/res/drawable/ic_baseline_info_24.xml | 10 ++++++++++ .../main/res/drawable/ic_menu_add_to_queue_dark.xml | 9 --------- .../main/res/drawable/ic_menu_add_to_queue_light.xml | 9 --------- ultrasonic/src/main/res/drawable/ic_play_last.xml | 10 ++++++++++ ultrasonic/src/main/res/drawable/ic_play_next.xml | 10 ++++++++++ .../src/main/res/drawable/media_play_next_dark.xml | 9 --------- .../src/main/res/drawable/media_play_next_light.xml | 9 --------- ultrasonic/src/main/res/layout/album_buttons.xml | 4 ++-- ultrasonic/src/main/res/values/styles.xml | 2 -- ultrasonic/src/main/res/values/themes.xml | 9 +++------ 17 files changed, 51 insertions(+), 67 deletions(-) create mode 100644 ultrasonic/src/main/res/drawable/ic_baseline_info_24.xml delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_dark.xml delete mode 100644 ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_light.xml create mode 100644 ultrasonic/src/main/res/drawable/ic_play_last.xml create mode 100644 ultrasonic/src/main/res/drawable/ic_play_next.xml delete mode 100644 ultrasonic/src/main/res/drawable/media_play_next_dark.xml delete mode 100644 ultrasonic/src/main/res/drawable/media_play_next_light.xml diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.kt b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.kt index 4881396d..183f7410 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.kt +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.kt @@ -167,7 +167,9 @@ class SearchFragment : MultiListFragment(), KoinComponent { inflater.inflate(R.menu.search, menu) val searchItem = menu.findItem(R.id.search_item) val searchView = searchItem.actionView as SearchView - searchView.setSearchableInfo(searchManager.getSearchableInfo(requireActivity().componentName)) + val searchableInfo = searchManager.getSearchableInfo(requireActivity().componentName) + searchView.setSearchableInfo(searchableInfo) + val arguments = arguments val autoPlay = arguments != null && arguments.getBoolean(Constants.INTENT_EXTRA_NAME_AUTOPLAY, false) @@ -186,8 +188,10 @@ class SearchFragment : MultiListFragment(), KoinComponent { Timber.d("onSuggestionClick: %d", position) val cursor = searchView.suggestionsAdapter.cursor cursor.moveToPosition(position) - val suggestion = - cursor.getString(2) // TODO: Try to do something with this magic const -- 2 is the index of col containing suggestion name. + + // TODO: Try to do something with this magic const: + // 2 is the index of col containing suggestion name. + val suggestion = cursor.getString(2) searchView.setQuery(suggestion, true) return true } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/BaseAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/BaseAdapter.kt index 9cf73253..804cb308 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/BaseAdapter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/BaseAdapter.kt @@ -33,7 +33,7 @@ class BaseAdapter : MultiTypeAdapter() { override var items: List get() = getCurrentList() set(value) { - throw IllegalAccessException("You must use submitList() to add data to the MultiTypeDiffAdapter") + throw IllegalAccessException("You must use submitList() to add data to the Adapter") } var mDiffer: AsyncListDiffer = AsyncListDiffer( diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/FolderSelectorBinder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/FolderSelectorBinder.kt index 8b615b7d..83880ee8 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/FolderSelectorBinder.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/FolderSelectorBinder.kt @@ -22,9 +22,9 @@ import org.moire.ultrasonic.service.RxBus * When clicked it will drop down a list of all available Folders and allow you to * select one. The intended usage is to supply a filter to lists of artists, albums, etc */ -class FolderSelectorBinder( - context: Context -) : ItemViewBinder(), KoinComponent { +class FolderSelectorBinder(context: Context) : + ItemViewBinder(), + KoinComponent { private val weakContext: WeakReference = WeakReference(context) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Helper.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Helper.kt index 9e371a00..4ed76b0a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Helper.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/Helper.kt @@ -8,10 +8,10 @@ import org.moire.ultrasonic.data.ActiveServerProvider object Helper { @JvmStatic - fun createPopupMenu(view: View, contextMenuLayout: Int = R.menu.artist_context_menu): PopupMenu { + fun createPopupMenu(view: View, layout: Int = R.menu.artist_context_menu): PopupMenu { val popup = PopupMenu(view.context, view) val inflater: MenuInflater = popup.menuInflater - inflater.inflate(contextMenuLayout, popup.menu) + inflater.inflate(layout, popup.menu) val downloadMenuItem = popup.menu.findItem(R.id.menu_download) downloadMenuItem?.isVisible = !ActiveServerProvider.isOffline() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistListFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistListFragment.kt index 865843f2..10b9c7ee 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistListFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/ArtistListFragment.kt @@ -69,7 +69,8 @@ class ArtistListFragment : EntryListFragment() { bundle.putString(Constants.INTENT_EXTRA_NAME_NAME, item.name) bundle.putString(Constants.INTENT_EXTRA_NAME_PARENT_ID, item.id) bundle.putBoolean(Constants.INTENT_EXTRA_NAME_ARTIST, (item is Artist)) - bundle.putString(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE, Constants.ALPHABETICAL_BY_NAME) + bundle.putString(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TYPE, + Constants.ALPHABETICAL_BY_NAME) bundle.putString(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_TITLE, item.name) bundle.putInt(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_SIZE, 1000) bundle.putInt(Constants.INTENT_EXTRA_NAME_ALBUM_LIST_OFFSET, 0) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt index 38a30901..7bd1c3a4 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt @@ -47,12 +47,4 @@ class SearchListModel(application: Application) : GenericListModel(application) songs = result.songs.take(SearchFragment.DEFAULT_SONGS) ) } - -// fun mergeList(result: SearchResult): List { -// val list = mutableListOf() -// list.add(result.artists) -// list.add(result.albums) -// list.add(result.songs) -// return list -// } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DragSortCallback.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DragSortCallback.kt index 9f1efe0b..91894874 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DragSortCallback.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DragSortCallback.kt @@ -18,9 +18,7 @@ class DragSortCallback : ItemTouchHelper.SimpleCallback(UP or DOWN, 0) { val from = viewHolder.bindingAdapterPosition val to = target.bindingAdapterPosition - Timber.w("MOVED %s %s", to, from) - - // Move it in the data set + // FIXME: Move it in the data set (recyclerView.adapter as BaseAdapter<*>).moveItem(from, to) return true diff --git a/ultrasonic/src/main/res/drawable/ic_baseline_info_24.xml b/ultrasonic/src/main/res/drawable/ic_baseline_info_24.xml new file mode 100644 index 00000000..17255b7a --- /dev/null +++ b/ultrasonic/src/main/res/drawable/ic_baseline_info_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_dark.xml b/ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_dark.xml deleted file mode 100644 index 157454a8..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_dark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_light.xml b/ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_light.xml deleted file mode 100644 index d330ca57..00000000 --- a/ultrasonic/src/main/res/drawable/ic_menu_add_to_queue_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/ic_play_last.xml b/ultrasonic/src/main/res/drawable/ic_play_last.xml new file mode 100644 index 00000000..156f3ce6 --- /dev/null +++ b/ultrasonic/src/main/res/drawable/ic_play_last.xml @@ -0,0 +1,10 @@ + + + diff --git a/ultrasonic/src/main/res/drawable/ic_play_next.xml b/ultrasonic/src/main/res/drawable/ic_play_next.xml new file mode 100644 index 00000000..cdd599eb --- /dev/null +++ b/ultrasonic/src/main/res/drawable/ic_play_next.xml @@ -0,0 +1,10 @@ + + + diff --git a/ultrasonic/src/main/res/drawable/media_play_next_dark.xml b/ultrasonic/src/main/res/drawable/media_play_next_dark.xml deleted file mode 100644 index b7d80429..00000000 --- a/ultrasonic/src/main/res/drawable/media_play_next_dark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/drawable/media_play_next_light.xml b/ultrasonic/src/main/res/drawable/media_play_next_light.xml deleted file mode 100644 index 3e7cedf9..00000000 --- a/ultrasonic/src/main/res/drawable/media_play_next_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/ultrasonic/src/main/res/layout/album_buttons.xml b/ultrasonic/src/main/res/layout/album_buttons.xml index 906f80d5..73acfcd0 100644 --- a/ultrasonic/src/main/res/layout/album_buttons.xml +++ b/ultrasonic/src/main/res/layout/album_buttons.xml @@ -32,7 +32,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/media_play_next" + android:src="@drawable/ic_play_next" android:visibility="gone" android:contentDescription="@string/common.play_next" /> @@ -42,7 +42,7 @@ android:layout_height="32dp" android:scaleType="fitCenter" android:layout_weight="1" - android:src="?attr/add_to_queue" + android:src="@drawable/ic_play_last" android:visibility="gone" android:contentDescription="@string/common.play_last" /> diff --git a/ultrasonic/src/main/res/values/styles.xml b/ultrasonic/src/main/res/values/styles.xml index f71b926c..d9cfaa1d 100644 --- a/ultrasonic/src/main/res/values/styles.xml +++ b/ultrasonic/src/main/res/values/styles.xml @@ -39,7 +39,6 @@ - @@ -73,7 +72,6 @@ - diff --git a/ultrasonic/src/main/res/values/themes.xml b/ultrasonic/src/main/res/values/themes.xml index bf6a0b1b..42a75fd3 100644 --- a/ultrasonic/src/main/res/values/themes.xml +++ b/ultrasonic/src/main/res/values/themes.xml @@ -12,7 +12,6 @@ @drawable/ic_star_full_dark @drawable/ic_menu_about_dark @drawable/ic_menu_select_all_dark - @drawable/ic_menu_add_to_queue_dark @drawable/ic_menu_browse_dark @drawable/ic_menu_exit_dark @drawable/ic_menu_backward_dark @@ -46,7 +45,6 @@ @drawable/media_start_normal_dark @drawable/ic_menu_podcasts_dark @drawable/ic_menu_refresh_dark - @drawable/media_play_next_dark @drawable/ic_stat_play_dark @drawable/media_stop_normal_dark @drawable/media_toggle_list_normal_dark @@ -63,6 +61,7 @@ @drawable/ic_more_vert_dark @drawable/list_selector_holo_dark @drawable/list_selector_holo_dark_selected + @color/selected_menu_background_light \ No newline at end of file