[Android] Logically rename action mode, menu and toolbar icons
Alexandre Perraud
git at videolan.org
Fri Oct 6 10:20:34 UTC 2023
vlc-android | branch: master | Alexandre Perraud <alexandre at videolan.org> | Fri Sep 15 11:45:44 2023 +0200| [8664d6d9fbb29ca509b15e2fe71adbcaa9837c11] | committer: Alexandre Perraud
Logically rename action mode, menu and toolbar icons
> https://code.videolan.org/videolan/vlc-android/commit/8664d6d9fbb29ca509b15e2fe71adbcaa9837c11
---
.../{ic_menu_addtoscan.xml => ic_am_addtoscan.xml} | 0
...enu_display_settings.xml => ic_am_display_settings.xml} | 0
.../{ic_menu_lastplaylist.xml => ic_am_lastplaylist.xml} | 0
.../drawable/{ic_menu_refresh.xml => ic_am_refresh.xml} | 0
.../main/res/drawable/{ic_menu_sort.xml => ic_am_sort.xml} | 0
.../res/drawable/{ic_view_grid.xml => ic_am_view_grid.xml} | 0
.../res/drawable/{ic_view_list.xml => ic_am_view_list.xml} | 0
.../vlc-android/res/layout/dialog_display_settings.xml | 2 +-
application/vlc-android/res/menu/activity_option.xml | 14 +++++++-------
application/vlc-android/res/menu/playlist_option.xml | 2 +-
application/vlc-android/res/menu/video_group.xml | 4 ++--
.../org/videolan/vlc/gui/dialogs/DisplaySettingsDialog.kt | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/application/resources/src/main/res/drawable/ic_menu_addtoscan.xml b/application/resources/src/main/res/drawable/ic_am_addtoscan.xml
similarity index 100%
rename from application/resources/src/main/res/drawable/ic_menu_addtoscan.xml
rename to application/resources/src/main/res/drawable/ic_am_addtoscan.xml
diff --git a/application/resources/src/main/res/drawable/ic_menu_display_settings.xml b/application/resources/src/main/res/drawable/ic_am_display_settings.xml
similarity index 100%
rename from application/resources/src/main/res/drawable/ic_menu_display_settings.xml
rename to application/resources/src/main/res/drawable/ic_am_display_settings.xml
diff --git a/application/resources/src/main/res/drawable/ic_menu_lastplaylist.xml b/application/resources/src/main/res/drawable/ic_am_lastplaylist.xml
similarity index 100%
rename from application/resources/src/main/res/drawable/ic_menu_lastplaylist.xml
rename to application/resources/src/main/res/drawable/ic_am_lastplaylist.xml
diff --git a/application/resources/src/main/res/drawable/ic_menu_refresh.xml b/application/resources/src/main/res/drawable/ic_am_refresh.xml
similarity index 100%
rename from application/resources/src/main/res/drawable/ic_menu_refresh.xml
rename to application/resources/src/main/res/drawable/ic_am_refresh.xml
diff --git a/application/resources/src/main/res/drawable/ic_menu_sort.xml b/application/resources/src/main/res/drawable/ic_am_sort.xml
similarity index 100%
rename from application/resources/src/main/res/drawable/ic_menu_sort.xml
rename to application/resources/src/main/res/drawable/ic_am_sort.xml
diff --git a/application/resources/src/main/res/drawable/ic_view_grid.xml b/application/resources/src/main/res/drawable/ic_am_view_grid.xml
similarity index 100%
rename from application/resources/src/main/res/drawable/ic_view_grid.xml
rename to application/resources/src/main/res/drawable/ic_am_view_grid.xml
diff --git a/application/resources/src/main/res/drawable/ic_view_list.xml b/application/resources/src/main/res/drawable/ic_am_view_list.xml
similarity index 100%
rename from application/resources/src/main/res/drawable/ic_view_list.xml
rename to application/resources/src/main/res/drawable/ic_am_view_list.xml
diff --git a/application/vlc-android/res/layout/dialog_display_settings.xml b/application/vlc-android/res/layout/dialog_display_settings.xml
index b01b308aae..a0f63d960a 100644
--- a/application/vlc-android/res/layout/dialog_display_settings.xml
+++ b/application/vlc-android/res/layout/dialog_display_settings.xml
@@ -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"
diff --git a/application/vlc-android/res/menu/activity_option.xml b/application/vlc-android/res/menu/activity_option.xml
index 72a52465c0..09ed917a15 100644
--- a/application/vlc-android/res/menu/activity_option.xml
+++ b/application/vlc-android/res/menu/activity_option.xml
@@ -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
diff --git a/application/vlc-android/res/menu/playlist_option.xml b/application/vlc-android/res/menu/playlist_option.xml
index f8bc04aa50..50d8a13978 100644
--- a/application/vlc-android/res/menu/playlist_option.xml
+++ b/application/vlc-android/res/menu/playlist_option.xml
@@ -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"
diff --git a/application/vlc-android/res/menu/video_group.xml b/application/vlc-android/res/menu/video_group.xml
index e83d8363c4..3d5921ee7c 100644
--- a/application/vlc-android/res/menu/video_group.xml
+++ b/application/vlc-android/res/menu/video_group.xml
@@ -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"/>
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DisplaySettingsDialog.kt b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DisplaySettingsDialog.kt
index caff425048..fb39fad9c3 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DisplaySettingsDialog.kt
+++ b/application/vlc-android/src/org/videolan/vlc/gui/dialogs/DisplaySettingsDialog.kt
@@ -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))
}
/**
More information about the Android
mailing list