From 2e3daab0da4bf423e6d13ca59fdd9dbbeeed1e92 Mon Sep 17 00:00:00 2001 From: Brayan Oliveira <69634269+brayandso@users.noreply.github.com> Date: Thu, 26 Oct 2023 19:41:41 -0300 Subject: [PATCH] refactor: remove duplicated icons if only the color needs to be changed, there is no need for having both a light and a dark file ic_send was actually unused --- .../java/com/ichi2/anki/AbstractFlashcardViewer.kt | 2 +- AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt | 2 +- AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt | 11 +++-------- AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt | 3 +-- .../com/ichi2/anki/dialogs/BackupPromptDialog.kt | 2 +- .../com/ichi2/anki/dialogs/DatabaseErrorDialog.kt | 12 ++++++------ .../dialogs/DeckPickerConfirmDeleteDeckDialog.kt | 2 +- .../java/com/ichi2/anki/dialogs/SyncErrorDialog.kt | 10 +++++----- .../java/com/ichi2/anki/preferences/AboutFragment.kt | 2 +- .../anki/preferences/AdvancedSettingsFragment.kt | 2 +- .../{ic_attachment_white.xml => ic_attachment.xml} | 4 ++-- .../src/main/res/drawable/ic_attachment_black.xml | 11 ----------- ..._import_export_black.xml => ic_import_export.xml} | 5 +++-- .../src/main/res/drawable/ic_import_export_white.xml | 5 ----- AnkiDroid/src/main/res/drawable/ic_send_black.xml | 9 --------- AnkiDroid/src/main/res/drawable/ic_send_white.xml | 5 ----- ...ic_sync_problem_black.xml => ic_sync_problem.xml} | 5 +++-- .../src/main/res/drawable/ic_sync_problem_white.xml | 5 ----- .../{ic_warning_black.xml => ic_warning.xml} | 5 +++-- AnkiDroid/src/main/res/drawable/ic_warning_white.xml | 5 ----- .../src/main/res/layout/card_multimedia_editline.xml | 10 ++++------ AnkiDroid/src/main/res/values/attrs.xml | 6 ------ AnkiDroid/src/main/res/values/theme_dark.xml | 6 ------ AnkiDroid/src/main/res/values/theme_light.xml | 6 ------ 24 files changed, 36 insertions(+), 99 deletions(-) rename AnkiDroid/src/main/res/drawable/{ic_attachment_white.xml => ic_attachment.xml} (88%) delete mode 100644 AnkiDroid/src/main/res/drawable/ic_attachment_black.xml rename AnkiDroid/src/main/res/drawable/{ic_import_export_black.xml => ic_import_export.xml} (69%) delete mode 100644 AnkiDroid/src/main/res/drawable/ic_import_export_white.xml delete mode 100644 AnkiDroid/src/main/res/drawable/ic_send_black.xml delete mode 100644 AnkiDroid/src/main/res/drawable/ic_send_white.xml rename AnkiDroid/src/main/res/drawable/{ic_sync_problem_black.xml => ic_sync_problem.xml} (80%) delete mode 100644 AnkiDroid/src/main/res/drawable/ic_sync_problem_white.xml rename AnkiDroid/src/main/res/drawable/{ic_warning_black.xml => ic_warning.xml} (67%) delete mode 100644 AnkiDroid/src/main/res/drawable/ic_warning_white.xml diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt index a0727f3fd655..b0bc988272f1 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt @@ -799,7 +799,7 @@ abstract class AbstractFlashcardViewer : protected fun showDeleteNoteDialog() { AlertDialog.Builder(this).show { title(R.string.delete_card_title) - iconAttr(R.attr.dialogErrorIcon) + setIcon(R.drawable.ic_warning) message( text = resources.getString( R.string.delete_note_message, diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt index 1e8cf7fe039d..ac379f7e88ed 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt @@ -2382,7 +2382,7 @@ open class DeckPicker : Timber.i("media sync disabled: displaying dialog") AlertDialog.Builder(this).show { setTitle(R.string.media_sync_required_title) - iconAttr(R.attr.dialogErrorIcon) + setIcon(R.drawable.ic_warning) setMessage(R.string.media_sync_unavailable_message) setPositiveButton(getString(R.string.scoped_storage_migrate)) { _, _ -> Timber.i("Performing unsafe storage migration") diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt index 41585267332b..6a9073543026 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt @@ -1286,15 +1286,10 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags newEditText.setCapitalize(prefs.getBoolean(PREF_NOTE_EDITOR_CAPITALIZE, true)) val mediaButton = editLineView.mediaButton val toggleStickyButton = editLineView.toggleSticky - // Load icons from attributes - val icons = Themes.getResFromAttr( - this, - intArrayOf(R.attr.attachFileImage, R.attr.upDownImage, R.attr.toggleStickyImage) - ) // Make the icon change between media icon and switch field icon depending on whether editing note type if (editModelMode && allowFieldRemapping()) { // Allow remapping if originally more than two fields - mediaButton.setBackgroundResource(icons[1]) + mediaButton.setBackgroundResource(R.drawable.ic_import_export) setRemapButtonListener(mediaButton, i) toggleStickyButton.setBackgroundResource(0) } else if (editModelMode && !allowFieldRemapping()) { @@ -1302,11 +1297,11 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags toggleStickyButton.setBackgroundResource(0) } else { // Use media editor button if not changing note type - mediaButton.setBackgroundResource(icons[0]) + mediaButton.setBackgroundResource(R.drawable.ic_attachment) setMMButtonListener(mediaButton, i) if (addNote) { // toggle sticky button - toggleStickyButton.setBackgroundResource(icons[2]) + toggleStickyButton.setBackgroundResource(R.drawable.ic_baseline_push_pin_24) setToggleStickyButtonListener(toggleStickyButton, i) } else { toggleStickyButton.setBackgroundResource(0) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt index 12be7e0ba5f2..c4f5ec53b225 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt @@ -31,7 +31,6 @@ import com.ichi2.libanki.DeckId import com.ichi2.libanki.Sound.SoundSide import com.ichi2.libanki.TTSTag import com.ichi2.utils.HandlerUtils.postDelayedOnNewHandler -import com.ichi2.utils.iconAttr import com.ichi2.utils.message import com.ichi2.utils.positiveButton import com.ichi2.utils.title @@ -107,7 +106,7 @@ object ReadText { if (availableTtsLocales.isEmpty()) { Timber.w("ReadText.textToSpeech() no TTS languages available") dialog.message(R.string.no_tts_available_message) - .iconAttr(R.attr.dialogErrorIcon) + .setIcon(R.drawable.ic_warning) .positiveButton(R.string.dialog_ok) } else { val localeMappings: List> = diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt index 4eacab2856bb..0bda06622043 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/BackupPromptDialog.kt @@ -212,7 +212,7 @@ class BackupPromptDialog private constructor(private val windowContext: Context) AlertDialog.Builder(context).show { title(R.string.dismiss_backup_warning_title) message(message) - iconAttr(R.attr.dialogErrorIcon) + setIcon(R.drawable.ic_warning) positiveButton(R.string.dialog_cancel) { onCancel() } negativeButton(R.string.button_disable_reminder) { onDisableReminder() } } diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt index f12a48266496..636e539b660e 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.kt @@ -76,7 +76,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() { dialog.show { cancelable(false) contentNullable(message) - iconAttr(R.attr.dialogErrorIcon) + icon(R.drawable.ic_warning) positiveButton(R.string.error_handling_options) { (activity as DeckPicker?) ?.showDatabaseErrorDialog(DIALOG_ERROR_HANDLING) @@ -92,7 +92,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() { dialog.show { cancelable(false) contentNullable(message) - iconAttr(R.attr.dialogErrorIcon) + icon(R.drawable.ic_warning) positiveButton(R.string.error_handling_options) { (activity as DeckPicker?) ?.showDatabaseErrorDialog(DIALOG_ERROR_HANDLING) @@ -146,7 +146,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() { i++ } dialog.show { - iconAttr(R.attr.dialogErrorIcon) + icon(R.drawable.ic_warning) negativeButton(R.string.dialog_cancel) listItems(items = titles.toList().map { it as CharSequence }) { _: MaterialDialog, index: Int, _: CharSequence -> when (mRepairValues[index]) { @@ -183,7 +183,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() { // Allow user to run BackupManager.repairCollection() dialog.show { contentNullable(message) - iconAttr(R.attr.dialogErrorIcon) + icon(R.drawable.ic_warning) positiveButton(R.string.dialog_positive_repair) { (activity as DeckPicker).repairCollection() dismissAllDialogFragments() @@ -318,7 +318,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() { dialog.show { cancelable(false) contentNullable(message) - iconAttr(R.attr.dialogErrorIcon) + icon(R.drawable.ic_warning) positiveButton(R.string.close) { exit() } @@ -429,7 +429,7 @@ class DatabaseErrorDialog : AsyncDialogFragment() { fun displayResetToNewDirectoryDialog(context: DeckPicker) { AlertDialog.Builder(context).show { title(R.string.backup_new_collection) - iconAttr(R.attr.dialogErrorIcon) + setIcon(R.drawable.ic_warning) message(R.string.new_unsafe_collection) positiveButton(R.string.dialog_positive_create) { Timber.w("Creating new collection") diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.kt index 88a9f79c1d8b..9c84c1ecc574 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.kt @@ -33,7 +33,7 @@ class DeckPickerConfirmDeleteDeckDialog : AnalyticsDialogFragment() { return AlertDialog.Builder(requireActivity()) .setTitle(R.string.delete_deck_title) .setMessage(requireArguments().getString("dialogMessage")) - .setIconAttribute(R.attr.dialogErrorIcon) + .setIcon(R.drawable.ic_warning) .setPositiveButton(R.string.dialog_positive_delete) { _, _ -> (activity as DeckPicker).deleteDeck(deckId) (activity as DeckPicker).dismissAllDialogFragments() diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt index 2a0e877bfc2b..52c2f4be9a4c 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt @@ -47,7 +47,7 @@ class SyncErrorDialog : AsyncDialogFragment() { return when (requireArguments().getInt("dialogType")) { DIALOG_USER_NOT_LOGGED_IN_SYNC -> { // User not logged in; take them to login screen - dialog.setIconAttribute(R.attr.dialogSyncErrorIcon) + dialog.setIcon(R.drawable.ic_sync_problem) .setPositiveButton(R.string.log_in) { _, _ -> (activity as SyncErrorDialogListener).loginToSyncServer() } @@ -56,7 +56,7 @@ class SyncErrorDialog : AsyncDialogFragment() { } DIALOG_CONNECTION_ERROR -> { // Connection error; allow user to retry or cancel - dialog.setIconAttribute(R.attr.dialogSyncErrorIcon) + dialog.setIcon(R.drawable.ic_sync_problem) .setPositiveButton(R.string.retry) { _, _ -> (activity as SyncErrorDialogListener).sync() dismissAllDialogFragments() @@ -68,7 +68,7 @@ class SyncErrorDialog : AsyncDialogFragment() { } DIALOG_SYNC_CONFLICT_RESOLUTION -> { // Sync conflict; allow user to cancel, or choose between local and remote versions - dialog.setIconAttribute(R.attr.dialogSyncErrorIcon) + dialog.setIcon(R.drawable.ic_sync_problem) .setPositiveButton(R.string.sync_conflict_keep_local_new) { _, _ -> (activity as SyncErrorDialogListener?) ?.showSyncErrorDialog(DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_LOCAL) @@ -84,7 +84,7 @@ class SyncErrorDialog : AsyncDialogFragment() { } DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_LOCAL -> { // Confirmation before pushing local collection to server after sync conflict - dialog.setIconAttribute(R.attr.dialogSyncErrorIcon) + dialog.setIcon(R.drawable.ic_sync_problem) .setPositiveButton(R.string.dialog_positive_replace) { _, _ -> val activity = activity as SyncErrorDialogListener? activity!!.sync(ConflictResolution.FULL_UPLOAD) @@ -95,7 +95,7 @@ class SyncErrorDialog : AsyncDialogFragment() { } DIALOG_SYNC_CONFLICT_CONFIRM_KEEP_REMOTE -> { // Confirmation before overwriting local collection with server collection after sync conflict - dialog.setIconAttribute(R.attr.dialogSyncErrorIcon) + dialog.setIcon(R.drawable.ic_sync_problem) .setPositiveButton(R.string.dialog_positive_replace) { _, _ -> val activity = activity as SyncErrorDialogListener? activity!!.sync(ConflictResolution.FULL_DOWNLOAD) diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AboutFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AboutFragment.kt index 91760369b9fb..35bceeaf4dc0 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AboutFragment.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AboutFragment.kt @@ -138,7 +138,7 @@ class AboutFragment : Fragment() { fun showEnableDevOptionsDialog(context: Context) { AlertDialog.Builder(context).show { setTitle(R.string.dev_options_enabled_pref) - setIcon(R.drawable.ic_warning_black) + setIcon(R.drawable.ic_warning) setMessage(R.string.dev_options_warning) setPositiveButton(R.string.dialog_ok) { _, _ -> enableDevOptions() } setNegativeButton(R.string.dialog_cancel) { _, _ -> clickCount = 0 } diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AdvancedSettingsFragment.kt b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AdvancedSettingsFragment.kt index f539b00e8f03..14ef4221beab 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AdvancedSettingsFragment.kt +++ b/AnkiDroid/src/main/java/com/ichi2/anki/preferences/AdvancedSettingsFragment.kt @@ -68,7 +68,7 @@ class AdvancedSettingsFragment : SettingsFragment() { requirePreference(R.string.pref_reset_languages_key).setOnPreferenceClickListener { AlertDialog.Builder(requireContext()).show { setTitle(R.string.reset_languages) - setIcon(R.drawable.ic_warning_black) + setIcon(R.drawable.ic_warning) setMessage(R.string.reset_languages_question) setPositiveButton(R.string.dialog_ok) { _, _ -> if (MetaDB.resetLanguages(requireContext())) { diff --git a/AnkiDroid/src/main/res/drawable/ic_attachment_white.xml b/AnkiDroid/src/main/res/drawable/ic_attachment.xml similarity index 88% rename from AnkiDroid/src/main/res/drawable/ic_attachment_white.xml rename to AnkiDroid/src/main/res/drawable/ic_attachment.xml index de77e0273367..13b2695c786a 100644 --- a/AnkiDroid/src/main/res/drawable/ic_attachment_white.xml +++ b/AnkiDroid/src/main/res/drawable/ic_attachment.xml @@ -1,7 +1,7 @@ + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="?attr/colorControlNormal"> diff --git a/AnkiDroid/src/main/res/drawable/ic_attachment_black.xml b/AnkiDroid/src/main/res/drawable/ic_attachment_black.xml deleted file mode 100644 index 133120299759..000000000000 --- a/AnkiDroid/src/main/res/drawable/ic_attachment_black.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/AnkiDroid/src/main/res/drawable/ic_import_export_black.xml b/AnkiDroid/src/main/res/drawable/ic_import_export.xml similarity index 69% rename from AnkiDroid/src/main/res/drawable/ic_import_export_black.xml rename to AnkiDroid/src/main/res/drawable/ic_import_export.xml index a2d1fa99f36e..bf194b7ed8fc 100644 --- a/AnkiDroid/src/main/res/drawable/ic_import_export_black.xml +++ b/AnkiDroid/src/main/res/drawable/ic_import_export.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> diff --git a/AnkiDroid/src/main/res/drawable/ic_import_export_white.xml b/AnkiDroid/src/main/res/drawable/ic_import_export_white.xml deleted file mode 100644 index 4c6fc6ef6e95..000000000000 --- a/AnkiDroid/src/main/res/drawable/ic_import_export_white.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/AnkiDroid/src/main/res/drawable/ic_send_black.xml b/AnkiDroid/src/main/res/drawable/ic_send_black.xml deleted file mode 100644 index e145ca83cc46..000000000000 --- a/AnkiDroid/src/main/res/drawable/ic_send_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/AnkiDroid/src/main/res/drawable/ic_send_white.xml b/AnkiDroid/src/main/res/drawable/ic_send_white.xml deleted file mode 100644 index 33efc5c9b692..000000000000 --- a/AnkiDroid/src/main/res/drawable/ic_send_white.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/AnkiDroid/src/main/res/drawable/ic_sync_problem_black.xml b/AnkiDroid/src/main/res/drawable/ic_sync_problem.xml similarity index 80% rename from AnkiDroid/src/main/res/drawable/ic_sync_problem_black.xml rename to AnkiDroid/src/main/res/drawable/ic_sync_problem.xml index e361fb9b6393..9fd03657a70f 100644 --- a/AnkiDroid/src/main/res/drawable/ic_sync_problem_black.xml +++ b/AnkiDroid/src/main/res/drawable/ic_sync_problem.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> diff --git a/AnkiDroid/src/main/res/drawable/ic_sync_problem_white.xml b/AnkiDroid/src/main/res/drawable/ic_sync_problem_white.xml deleted file mode 100644 index f242798f055e..000000000000 --- a/AnkiDroid/src/main/res/drawable/ic_sync_problem_white.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/AnkiDroid/src/main/res/drawable/ic_warning_black.xml b/AnkiDroid/src/main/res/drawable/ic_warning.xml similarity index 67% rename from AnkiDroid/src/main/res/drawable/ic_warning_black.xml rename to AnkiDroid/src/main/res/drawable/ic_warning.xml index b3a9e036b461..a9ccbc81f599 100644 --- a/AnkiDroid/src/main/res/drawable/ic_warning_black.xml +++ b/AnkiDroid/src/main/res/drawable/ic_warning.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> diff --git a/AnkiDroid/src/main/res/drawable/ic_warning_white.xml b/AnkiDroid/src/main/res/drawable/ic_warning_white.xml deleted file mode 100644 index 29d8a440ec9f..000000000000 --- a/AnkiDroid/src/main/res/drawable/ic_warning_white.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/AnkiDroid/src/main/res/layout/card_multimedia_editline.xml b/AnkiDroid/src/main/res/layout/card_multimedia_editline.xml index 2b4f85b63659..be3e38505bf5 100644 --- a/AnkiDroid/src/main/res/layout/card_multimedia_editline.xml +++ b/AnkiDroid/src/main/res/layout/card_multimedia_editline.xml @@ -24,11 +24,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="end|center_vertical" - android:background="?attr/toggleStickyImage" + android:background="@drawable/ic_baseline_push_pin_24" android:layout_marginEnd="16dp" app:layout_constraintEnd_toStartOf="@id/id_media_button" - app:layout_constraintTop_toTopOf="parent" - tools:background="@drawable/ic_baseline_push_pin_24"/> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent"/> - - - - - - diff --git a/AnkiDroid/src/main/res/values/theme_dark.xml b/AnkiDroid/src/main/res/values/theme_dark.xml index 75f5276254a2..9eead0842e10 100644 --- a/AnkiDroid/src/main/res/values/theme_dark.xml +++ b/AnkiDroid/src/main/res/values/theme_dark.xml @@ -118,12 +118,6 @@ @drawable/fab_label_background @drawable/nav_drawer_logo_dark_theme - @drawable/ic_attachment_white - @drawable/ic_baseline_push_pin_24 - @drawable/ic_import_export_white - @drawable/ic_warning_white - @drawable/ic_sync_problem_white - @drawable/ic_send_white 56dip @color/white diff --git a/AnkiDroid/src/main/res/values/theme_light.xml b/AnkiDroid/src/main/res/values/theme_light.xml index de8cc9bb673e..1da5ac1938c8 100644 --- a/AnkiDroid/src/main/res/values/theme_light.xml +++ b/AnkiDroid/src/main/res/values/theme_light.xml @@ -133,12 +133,6 @@ APIs. It's visible when there aren't enough decks to fill the screen. @drawable/fab_label_background @drawable/nav_drawer_logo - @drawable/ic_attachment_black - @drawable/ic_baseline_push_pin_24 - @drawable/ic_import_export_black - @drawable/ic_warning_black - @drawable/ic_sync_problem_black - @drawable/ic_send_black 56dip @color/black