Skip to content
Snippets Groups Projects
Commit 8664d6d9 authored by Alexandre Perraud's avatar Alexandre Perraud
Browse files

Logically rename action mode, menu and toolbar icons

parent cb57f03e
No related branches found
No related tags found
1 merge request!1770New topappbar icons
Pipeline #393272 passed with stage
in 18 minutes and 13 seconds
Showing
with 12 additions and 12 deletions
......@@ -84,7 +84,7 @@
app:layout_constraintBottom_toBottomOf="@+id/display_mode_group"
app:layout_constraintEnd_toEndOf="@+id/display_mode_group"
app:layout_constraintTop_toTopOf="@+id/display_mode_group"
tools:srcCompat="@drawable/ic_view_grid" />
tools:srcCompat="@drawable/ic_am_view_grid" />
<View
android:id="@+id/show_all_artist_group"
......
......@@ -43,7 +43,7 @@
<item
android:orderInCategory="2"
android:id="@+id/ml_menu_last_playlist"
android:icon="@drawable/ic_menu_lastplaylist"
android:icon="@drawable/ic_am_lastplaylist"
android:title="@string/resume_playback_short_title"
vlc:showAsAction="ifRoom|collapseActionView"
android:visible="false"/>
......@@ -51,7 +51,7 @@
<item
android:orderInCategory="2"
android:id="@+id/ml_menu_display_options"
android:icon="@drawable/ic_menu_display_settings"
android:icon="@drawable/ic_am_display_settings"
android:title="@string/display_settings"
vlc:showAsAction="ifRoom|collapseActionView"
android:visible="false"/>
......@@ -67,26 +67,26 @@
android:id="@+id/ml_menu_display_list"
android:title="@string/display_in_list"
vlc:showAsAction="ifRoom|collapseActionView"
android:icon="@drawable/ic_view_list"
android:icon="@drawable/ic_am_view_list"
android:visible="false"/>
<item
android:orderInCategory="3"
android:id="@+id/ml_menu_display_grid"
android:title="@string/display_in_grid"
vlc:showAsAction="ifRoom|collapseActionView"
android:icon="@drawable/ic_view_grid"
android:icon="@drawable/ic_am_view_grid"
android:visible="false"/>
<item
android:orderInCategory="3"
android:id="@+id/ml_menu_scan"
android:title="@string/add_to_scanned"
vlc:showAsAction="ifRoom|collapseActionView"
android:icon="@drawable/ic_menu_addtoscan"
android:icon="@drawable/ic_am_addtoscan"
android:visible="false" />
<item
android:orderInCategory="2"
android:title="@string/sortby"
android:icon="@drawable/ic_menu_sort"
android:icon="@drawable/ic_am_sort"
android:contentDescription="@string/sortby"
android:id="@+id/ml_menu_sortby"
vlc:showAsAction="ifRoom|collapseActionView"
......@@ -178,7 +178,7 @@
<item
android:orderInCategory="4"
android:id="@+id/ml_menu_refresh"
android:icon="@drawable/ic_menu_refresh"
android:icon="@drawable/ic_am_refresh"
vlc:showAsAction="never"
android:title="@string/refresh"/>
<item
......
......@@ -42,7 +42,7 @@
<item
android:orderInCategory="2"
android:title="@string/sortby"
android:icon="@drawable/ic_menu_sort"
android:icon="@drawable/ic_am_sort"
android:contentDescription="@string/sortby"
android:id="@+id/ml_menu_sortby"
app:showAsAction="ifRoom|collapseActionView"
......
......@@ -11,7 +11,7 @@
<item
android:title="@string/sortby"
android:icon="@drawable/ic_menu_sort"
android:icon="@drawable/ic_am_sort"
android:id="@+id/ml_menu_sortby"
vlc:showAsAction="ifRoom">
<menu>
......@@ -34,7 +34,7 @@
</item>
<item
android:id="@+id/ml_menu_refresh"
android:icon="@drawable/ic_menu_refresh"
android:icon="@drawable/ic_am_refresh"
android:title="@string/refresh"
vlc:showAsAction="ifRoom"
android:nextFocusDown="@id/ml_menu_refresh"/>
......
......@@ -184,7 +184,7 @@ class DisplaySettingsDialog : VLCBottomSheetDialogFragment() {
*/
private fun updateDisplayMode() {
binding.displayInListText.text = getString(if (!displayInCards) R.string.display_in_grid else R.string.display_in_list)
binding.displayInListImage.setImageDrawable(ContextCompat.getDrawable(requireActivity(), if (!displayInCards) R.drawable.ic_view_grid else R.drawable.ic_view_list))
binding.displayInListImage.setImageDrawable(ContextCompat.getDrawable(requireActivity(), if (!displayInCards) R.drawable.ic_am_view_grid else R.drawable.ic_am_view_list))
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment