diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt index 5b3f43bcf..1f7ccd16e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt @@ -120,7 +120,7 @@ open class ExtensionController : } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.extension_main, menu) + inflater.inflate(R.menu.browse_extensions, menu) val searchItem = menu.findItem(R.id.action_search) val searchView = searchItem.actionView as SearchView diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt index 4197b9b2c..7129f38f1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt @@ -64,7 +64,7 @@ class MigrationSourcesController : } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.source_migration, menu) + inflater.inflate(R.menu.browse_migrate, menu) } override fun onOptionsItemSelected(item: MenuItem): Boolean { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt index 102fa2d60..21bf6c241 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt @@ -390,7 +390,7 @@ class SourceController(bundle: Bundle? = null) : createOptionsMenu( menu, inflater, - R.menu.source_main, + R.menu.browse_sources, R.id.action_search, R.string.action_global_search_hint, false // GlobalSearch handles the searching here diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index 8e6ff7193..363eb2147 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -119,7 +119,7 @@ class MoreController : } preference { titleRes = R.string.label_backup - iconRes = R.drawable.ic_backup_24dp + iconRes = R.drawable.ic_settings_backup_restore_24dp iconTint = tintColor onClick { router.pushController(SettingsBackupController().withFadeTransaction()) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt index e9c13484a..ba215f52a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt @@ -60,7 +60,7 @@ class SettingsMainController : SettingsController() { onClick { navigateTo(SettingsBrowseController()) } } preference { - iconRes = R.drawable.ic_backup_24dp + iconRes = R.drawable.ic_settings_backup_restore_24dp iconTint = tintColor titleRes = R.string.label_backup onClick { navigateTo(SettingsBackupController()) } diff --git a/app/src/main/res/drawable/ic_backup_24dp.xml b/app/src/main/res/drawable/ic_backup_24dp.xml deleted file mode 100644 index 7b401a2c3..000000000 --- a/app/src/main/res/drawable/ic_backup_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_24dp.xml b/app/src/main/res/drawable/ic_settings_backup_restore_24dp.xml new file mode 100644 index 000000000..46300cd9b --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_backup_restore_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml index ab91bc4c4..6f52bf4a8 100644 --- a/app/src/main/res/drawable/ic_share_24dp.xml +++ b/app/src/main/res/drawable/ic_share_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/app/src/main/res/drawable/ic_translate_24dp.xml b/app/src/main/res/drawable/ic_translate_24dp.xml new file mode 100644 index 000000000..e7c9bf411 --- /dev/null +++ b/app/src/main/res/drawable/ic_translate_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/menu/extension_main.xml b/app/src/main/res/menu/browse_extensions.xml similarity index 92% rename from app/src/main/res/menu/extension_main.xml rename to app/src/main/res/menu/browse_extensions.xml index 578441c5c..1a0d8e698 100644 --- a/app/src/main/res/menu/extension_main.xml +++ b/app/src/main/res/menu/browse_extensions.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/menu/source_migration.xml b/app/src/main/res/menu/browse_migrate.xml similarity index 100% rename from app/src/main/res/menu/source_migration.xml rename to app/src/main/res/menu/browse_migrate.xml diff --git a/app/src/main/res/menu/source_main.xml b/app/src/main/res/menu/browse_sources.xml similarity index 92% rename from app/src/main/res/menu/source_main.xml rename to app/src/main/res/menu/browse_sources.xml index 578441c5c..1a0d8e698 100644 --- a/app/src/main/res/menu/source_main.xml +++ b/app/src/main/res/menu/browse_sources.xml @@ -11,7 +11,7 @@